b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

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

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/build-support/buildenv/builder.pl
View file

@ -10,7 +10,6 @@ STDOUT->autoflush(1);
my $out = $ENV{"out"}; my $out = $ENV{"out"};
my @pathsToLink = split ' ', $ENV{"pathsToLink"}; my @pathsToLink = split ' ', $ENV{"pathsToLink"};
sub isInPathsToLink { sub isInPathsToLink {
@ -153,7 +152,3 @@ my $manifest = $ENV{"manifest"};
if ($manifest) { if ($manifest) {
symlink($manifest, "$out/manifest") or die "cannot create manifest"; symlink($manifest, "$out/manifest") or die "cannot create manifest";
} }
system("eval \"\$postBuild\"") == 0
or die "post-build hook failed";

13
pkgs/build-support/buildenv/default.nix
View file

@ -2,7 +2,7 @@
# a fork of the buildEnv in the Nix distribution. Most changes should # a fork of the buildEnv in the Nix distribution. Most changes should
# eventually be merged back into the Nix distribution. # eventually be merged back into the Nix distribution.
{stdenv, perl}: { perl, runCommand }:
{ name { name
@ -25,8 +25,9 @@
postBuild ? "" postBuild ? ""
}: }:
stdenv.mkDerivation { runCommand name
inherit name manifest paths ignoreCollisions pathsToLink postBuild; { inherit manifest paths ignoreCollisions pathsToLink postBuild; }
realBuilder = "${perl}/bin/perl"; ''
args = ["-w" ./builder.pl]; ${perl}/bin/perl -w ${./builder.pl}
} eval "$postBuild"
''

3
pkgs/top-level/all-packages.nix
View file

@ -233,9 +233,8 @@ let
theAttrSet = arg; theAttrSet = arg;
}; };
buildEnvScript = ../build-support/buildenv/builder.pl;
buildEnv = import ../build-support/buildenv { buildEnv = import ../build-support/buildenv {
inherit stdenv perl; inherit runCommand perl;
}; };
dotnetenv = import ../build-support/dotnetenv { dotnetenv = import ../build-support/dotnetenv {