diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-01-29 00:17:59 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-01-29 00:17:59 +0000 |
| commit | 0a882d423b5b6ad78ae85ed111916cbf0efaf300 (patch) | |
| tree | b61f8aad9d9269dedd517dd3b0c930656b37bded | |
| parent | 8a57c8bf357966c0dd57f600f2e530493c4faaad (diff) | |
| download | nixpkgs-0a882d423b5b6ad78ae85ed111916cbf0efaf300.tar nixpkgs-0a882d423b5b6ad78ae85ed111916cbf0efaf300.tar.gz nixpkgs-0a882d423b5b6ad78ae85ed111916cbf0efaf300.tar.bz2 nixpkgs-0a882d423b5b6ad78ae85ed111916cbf0efaf300.tar.lz nixpkgs-0a882d423b5b6ad78ae85ed111916cbf0efaf300.tar.xz nixpkgs-0a882d423b5b6ad78ae85ed111916cbf0efaf300.tar.zst nixpkgs-0a882d423b5b6ad78ae85ed111916cbf0efaf300.zip | |
* Fix stdenv evaluation - use ${stdenv.shell} instead of
${stdenv.bash}/bin/bash.
svn path=/nixpkgs/trunk/; revision=19723
| -rw-r--r-- | pkgs/development/libraries/science/math/blas/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/science/math/liblapack/default.nix | 2 | ||||
| -rw-r--r-- | 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 22eced7d070..eeaf28aec3c 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 0c15834f383..240d13105f8 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 32c4fe3de89..62c541ef7ba 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"; |