diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-11-03 22:37:00 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-11-03 22:37:00 +0000 |
commit | a2102af6dfa3a5ab34a6bfcd00f8534b515d0b1b (patch) | |
tree | 8eca3660caa372b1af97622af9c23c56836b2129 /pkgs/build-support/buildenv | |
parent | 078587a84611de78159a88847cb4a28286cb197f (diff) |
* 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
Diffstat (limited to 'pkgs/build-support/buildenv')
-rwxr-xr-x | pkgs/build-support/buildenv/builder.pl | 5 | ||||
-rw-r--r-- | pkgs/build-support/buildenv/default.nix | 13 |
2 files changed, 7 insertions, 11 deletions
diff --git a/pkgs/build-support/buildenv/builder.pl b/pkgs/build-support/buildenv/builder.pl index cdd65cbc523a0..71502c9f66839 100755 --- a/pkgs/build-support/buildenv/builder.pl +++ b/pkgs/build-support/buildenv/builder.pl @@ -10,7 +10,6 @@ STDOUT->autoflush(1); my $out = $ENV{"out"}; - my @pathsToLink = split ' ', $ENV{"pathsToLink"}; sub isInPathsToLink { @@ -153,7 +152,3 @@ my $manifest = $ENV{"manifest"}; if ($manifest) { symlink($manifest, "$out/manifest") or die "cannot create manifest"; } - - -system("eval \"\$postBuild\"") == 0 - or die "post-build hook failed"; diff --git a/pkgs/build-support/buildenv/default.nix b/pkgs/build-support/buildenv/default.nix index abe2f37ec6604..1bfada4fb6270 100644 --- a/pkgs/build-support/buildenv/default.nix +++ b/pkgs/build-support/buildenv/default.nix @@ -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" + '' |