public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Fix stdenv evaluation - use ${stdenv.shell} instead of

Browse Source 
${stdenv.bash}/bin/bash.

svn path=/nixpkgs/trunk/; revision=19723
This commit is contained in:
Eelco Dolstra 2010-01-29 00:17:59 +00:00
parent 8a57c8bf35
commit 0a882d423b
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/science/math/blas/default.nix
View File

@ -10,7 +10,7 @@ stdenv.mkDerivation {
buildInputs = [gfortran]; buildInputs = [gfortran];
configurePhase = '' configurePhase = ''
echo >make.inc "SHELL = ${stdenv.bash}/bin/bash" echo >make.inc "SHELL = ${stdenv.shell}"
echo >>make.inc "PLAT = _LINUX" echo >>make.inc "PLAT = _LINUX"
echo >>make.inc "FORTRAN = gfortran" echo >>make.inc "FORTRAN = gfortran"
echo >>make.inc "OPTS = -O2 -fPIC" echo >>make.inc "OPTS = -O2 -fPIC"

2
pkgs/development/libraries/science/math/liblapack/default.nix
View File

@ -11,7 +11,7 @@ stdenv.mkDerivation {
patches = [ ./blas-link.patch ]; patches = [ ./blas-link.patch ];
configurePhase = '' configurePhase = ''
echo >make.inc "SHELL = ${stdenv.bash}/bin/bash" echo >make.inc "SHELL = ${stdenv.shell}"
echo >>make.inc "PLAT =" echo >>make.inc "PLAT ="
echo >>make.inc "FORTRAN = gfortran" echo >>make.inc "FORTRAN = gfortran"
echo >>make.inc "OPTS = -O2 -fPIC" echo >>make.inc "OPTS = -O2 -fPIC"

2
pkgs/development/libraries/scmccid/default.nix
View File

@ -1,5 +1,7 @@
{stdenv, fetchurl, patchelf, libusb}: {stdenv, fetchurl, patchelf, libusb}:
assert stdenv ? gcc;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "scmccid-5.0.11"; name = "scmccid-5.0.11";