* 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:
parent
078587a846
commit
a2102af6df
|
@ -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";
|
|
||||||
|
|
|
@ -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"
|
||||||
|
''
|
||||||
|
|
|
@ -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 {
|
||||||
|
|
Loading…
Reference in a new issue