diff options
| author | John Ericson <Ericson2314@yahoo.com> | 2017-04-15 01:27:05 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-15 01:27:05 -0400 |
| commit | 3bff114d95da3c9f1d5a438c61cdc8b422676af3 (patch) | |
| tree | 6aa4f8d35671c609eb6749b6938c9a7e44d9030a /pkgs/build-support | |
| parent | cdbcaa56b6dd06d2d7f215ccbcab966a9a902773 (diff) | |
| parent | f89504d06746f50d1b7915ad6b31fc58a3449541 (diff) | |
| download | nixlib-3bff114d95da3c9f1d5a438c61cdc8b422676af3.tar nixlib-3bff114d95da3c9f1d5a438c61cdc8b422676af3.tar.gz nixlib-3bff114d95da3c9f1d5a438c61cdc8b422676af3.tar.bz2 nixlib-3bff114d95da3c9f1d5a438c61cdc8b422676af3.tar.lz nixlib-3bff114d95da3c9f1d5a438c61cdc8b422676af3.tar.xz nixlib-3bff114d95da3c9f1d5a438c61cdc8b422676af3.tar.zst nixlib-3bff114d95da3c9f1d5a438c61cdc8b422676af3.zip | |
Merge pull request #24871 from elitak/cross-staging
Various small crossDrv fixes
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/buildenv/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/build-support/buildenv/default.nix b/pkgs/build-support/buildenv/default.nix index dc05ec1678cb..47e2c1b904c3 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. -{ perl, runCommand, lib }: +{ buildPackages, runCommand, lib }: { name @@ -66,6 +66,6 @@ runCommand name passAsFile = if builtins.stringLength pkgs >= 128*1024 then [ "pkgs" ] else null; } '' - ${perl}/bin/perl -w ${./builder.pl} + ${buildPackages.perl}/bin/perl -w ${./builder.pl} eval "$postBuild" '' |