diff options
| author | Lluís Batlle i Rossell <viric@viric.name> | 2012-12-27 15:10:55 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@viric.name> | 2012-12-27 15:10:55 +0000 |
| commit | c41881842b316c1e38e54b00bee1770f9eb5eb2c (patch) | |
| tree | 05deb044bd19c20058d65e4830b227b72c8e1646 /pkgs/stdenv/linux | |
| parent | d05b33653e6376124f39984a56c92295b8a65e24 (diff) | |
| parent | 636303797fa55c6c99de11d3c5a6ff3657fe4ecd (diff) | |
| download | nixlib-c41881842b316c1e38e54b00bee1770f9eb5eb2c.tar nixlib-c41881842b316c1e38e54b00bee1770f9eb5eb2c.tar.gz nixlib-c41881842b316c1e38e54b00bee1770f9eb5eb2c.tar.bz2 nixlib-c41881842b316c1e38e54b00bee1770f9eb5eb2c.tar.lz nixlib-c41881842b316c1e38e54b00bee1770f9eb5eb2c.tar.xz nixlib-c41881842b316c1e38e54b00bee1770f9eb5eb2c.tar.zst nixlib-c41881842b316c1e38e54b00bee1770f9eb5eb2c.zip | |
Merge branch 'stdenv-updates' into pi-stdenv-updates
Diffstat (limited to 'pkgs/stdenv/linux')
| -rw-r--r-- | pkgs/stdenv/linux/default.nix | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 224e749e6090..cae95615a446 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -95,6 +95,7 @@ rec { initialPath = [bootstrapTools] ++ extraPath; fetchurlBoot = fetchurl; inherit gcc; + withNixImpure = if platform ? nixImpure then platform.nixImpure else false; # Having the proper 'platform' in all the stdenvs allows getting proper # linuxHeaders for example. extraAttrs = extraAttrs // { inherit platform; }; @@ -270,7 +271,7 @@ rec { inherit system; preHook = commonPreHook; - + initialPath = ((import ../common-path.nix) {pkgs = stdenvLinuxBoot4Pkgs;}) ++ [stdenvLinuxBoot4Pkgs.patchelf]; @@ -287,6 +288,8 @@ rec { shell = stdenvLinuxBoot4Pkgs.bash + "/bin/bash"; fetchurlBoot = fetchurl; + + withNixImpure = if platform ? nixImpure then platform.nixImpure else false; extraAttrs = { inherit (stdenvLinuxBoot3Pkgs) glibc; |