From 0a882d423b5b6ad78ae85ed111916cbf0efaf300 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 29 Jan 2010 00:17:59 +0000
Subject: [PATCH] * Fix stdenv evaluation - use ${stdenv.shell} instead of  
 ${stdenv.bash}/bin/bash.

svn path=/nixpkgs/trunk/; revision=19723
---
 pkgs/development/libraries/science/math/blas/default.nix      | 2 +-
 pkgs/development/libraries/science/math/liblapack/default.nix | 2 +-
 pkgs/development/libraries/scmccid/default.nix                | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/science/math/blas/default.nix b/pkgs/development/libraries/science/math/blas/default.nix
index 22eced7d070f..eeaf28aec3c3 100644
--- a/pkgs/development/libraries/science/math/blas/default.nix
+++ b/pkgs/development/libraries/science/math/blas/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
   buildInputs = [gfortran];
 
   configurePhase = ''
-    echo >make.inc  "SHELL = ${stdenv.bash}/bin/bash"
+    echo >make.inc  "SHELL = ${stdenv.shell}"
     echo >>make.inc "PLAT = _LINUX"
     echo >>make.inc "FORTRAN = gfortran"
     echo >>make.inc "OPTS = -O2 -fPIC"
diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix
index 0c15834f3830..240d13105f85 100644
--- a/pkgs/development/libraries/science/math/liblapack/default.nix
+++ b/pkgs/development/libraries/science/math/liblapack/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
   patches = [ ./blas-link.patch ];
 
   configurePhase = ''
-    echo >make.inc  "SHELL = ${stdenv.bash}/bin/bash"
+    echo >make.inc  "SHELL = ${stdenv.shell}"
     echo >>make.inc "PLAT ="
     echo >>make.inc "FORTRAN = gfortran"
     echo >>make.inc "OPTS = -O2 -fPIC"
diff --git a/pkgs/development/libraries/scmccid/default.nix b/pkgs/development/libraries/scmccid/default.nix
index 32c4fe3de897..62c541ef7bab 100644
--- a/pkgs/development/libraries/scmccid/default.nix
+++ b/pkgs/development/libraries/scmccid/default.nix
@@ -1,5 +1,7 @@
 {stdenv, fetchurl, patchelf, libusb}:
 
+assert stdenv ? gcc;
+
 stdenv.mkDerivation rec {
   name = "scmccid-5.0.11";