* buildEnv: use $SHELL (i.e. bash) rather than /bin/sh. This allows

NixOS VM tests to be built on Ubuntu, where /bin/sh is dash rather
  than bash.

svn path=/nixpkgs/trunk/; revision=24592
This commit is contained in:
Eelco Dolstra
2010-11-03 22:37:00 +00:00
parent 078587a846
commit a2102af6df
3 changed files with 8 additions and 13 deletions
+7 -6
View File
@@ -2,7 +2,7 @@
# a fork of the buildEnv in the Nix distribution. Most changes should
# eventually be merged back into the Nix distribution.
{stdenv, perl}:
{ perl, runCommand }:
{ name
@@ -25,8 +25,9 @@
postBuild ? ""
}:
stdenv.mkDerivation {
inherit name manifest paths ignoreCollisions pathsToLink postBuild;
realBuilder = "${perl}/bin/perl";
args = ["-w" ./builder.pl];
}
runCommand name
{ inherit manifest paths ignoreCollisions pathsToLink postBuild; }
''
${perl}/bin/perl -w ${./builder.pl}
eval "$postBuild"
''