diff options
| author | Robin Gloster <mail@glob.in> | 2016-03-15 01:44:24 +0000 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-03-15 01:44:24 +0000 |
| commit | 3f45f0948d6fe158bed063adb66850ded0ba4861 (patch) | |
| tree | ac717689d391d3f5333132fc34e4b2aed829414c /pkgs/stdenv/linux | |
| parent | a9b942c0617b1cd5f0732d05eadad0114a178f37 (diff) | |
| parent | d227d9a70e41d65e4e6f4ac75a9d243c5a19fa85 (diff) | |
| download | nixlib-3f45f0948d6fe158bed063adb66850ded0ba4861.tar nixlib-3f45f0948d6fe158bed063adb66850ded0ba4861.tar.gz nixlib-3f45f0948d6fe158bed063adb66850ded0ba4861.tar.bz2 nixlib-3f45f0948d6fe158bed063adb66850ded0ba4861.tar.lz nixlib-3f45f0948d6fe158bed063adb66850ded0ba4861.tar.xz nixlib-3f45f0948d6fe158bed063adb66850ded0ba4861.tar.zst nixlib-3f45f0948d6fe158bed063adb66850ded0ba4861.zip | |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/stdenv/linux')
| -rw-r--r-- | pkgs/stdenv/linux/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/stdenv/linux/make-bootstrap-tools-cross.nix | 2 | ||||
| -rw-r--r-- | pkgs/stdenv/linux/make-bootstrap-tools.nix | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 965188a0cdd8..1135ad78acdc 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -6,7 +6,7 @@ # The function defaults are for easy testing. { system ? builtins.currentSystem -, allPackages ? import ../../top-level/all-packages.nix +, allPackages ? import ../../.. , platform ? null, config ? {}, lib ? (import ../../../lib) , customBootstrapFiles ? null }: diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix index bf060329be6d..3adb00693f75 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix @@ -3,7 +3,7 @@ let buildFor = toolsArch: ( let - pkgsFun = import ../../top-level/all-packages.nix; + pkgsFun = import ../../..; pkgsNoParams = pkgsFun {}; sheevaplugCrossSystem = { diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index 3c8948699726..75dc009f5e67 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -1,6 +1,6 @@ { system ? builtins.currentSystem }: -with import ../../top-level/all-packages.nix {inherit system;}; +with import ../../.. {inherit system;}; rec { |