diff options
| author | Nicolas B. Pierron <nicolas.b.pierron@gmail.com> | 2016-03-20 17:50:06 +0000 |
|---|---|---|
| committer | Nicolas B. Pierron <nicolas.b.pierron@gmail.com> | 2016-03-20 17:50:06 +0000 |
| commit | 01693ac154138e95324959d260056312021e0dae (patch) | |
| tree | 36eb701ae1702c7b3d74a5ee339f5a83848d7521 | |
| parent | ff72cf185e0f0b5eaa5691f31574d16563a703d0 (diff) | |
| download | nixlib-01693ac154138e95324959d260056312021e0dae.tar nixlib-01693ac154138e95324959d260056312021e0dae.tar.gz nixlib-01693ac154138e95324959d260056312021e0dae.tar.bz2 nixlib-01693ac154138e95324959d260056312021e0dae.tar.lz nixlib-01693ac154138e95324959d260056312021e0dae.tar.xz nixlib-01693ac154138e95324959d260056312021e0dae.tar.zst nixlib-01693ac154138e95324959d260056312021e0dae.zip | |
Move stdenvAdapaters attribute from all-packages.nix into the stdenvAdapters of the top-level.
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/default.nix | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e8b659586c21..14e870533879 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1,6 +1,6 @@ { system, bootStdenv, noSysDirs, gccWithCC, gccWithProfiling , config, crossSystem, platform, lib -, pkgsWithOverrides, stdenvAdapters +, pkgsWithOverrides , ... }: self: pkgs: @@ -74,7 +74,7 @@ in ### Helper functions. - inherit lib config stdenvAdapters; + inherit lib config; inherit (lib) lowPrio hiPrio appendToName makeOverridable; inherit (misc) versionedDerivation; diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix index 58b2a75f0d25..0e9f7ecf056f 100644 --- a/pkgs/top-level/default.nix +++ b/pkgs/top-level/default.nix @@ -114,14 +114,16 @@ let pkgsWithOverrides = overrider: let stdenvAdapters = - import ../stdenv/adapters.nix pkgs; + let res = import ../stdenv/adapters.nix pkgs; in res // { + stdenvAdapters = res; + }; trivialBuilders = (import ../build-support/trivial-builders.nix { inherit lib; inherit (pkgs) stdenv; inherit (pkgs.xorg) lndir; }); stdenvDefault = (import ./stdenv.nix topLevelArguments) {} pkgs; - selfArgs = topLevelArguments // { inherit pkgsWithOverrides stdenvAdapters; }; + selfArgs = topLevelArguments // { inherit pkgsWithOverrides; }; self = (import ./all-packages.nix selfArgs) self pkgs; aliases = import ./aliases.nix self; |