JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move stdenvAdapaters attribute from all-packages.nix into the stdenvAdapters of the top-level.

Browse Source
This commit is contained in:
Nicolas B. Pierron 2016-03-20 17:50:06 +00:00
parent ff72cf185e
commit 01693ac154
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/top-level/all-packages.nix
View File

@ -1,6 +1,6 @@
{ system, bootStdenv, noSysDirs, gccWithCC, gccWithProfiling { system, bootStdenv, noSysDirs, gccWithCC, gccWithProfiling
, config, crossSystem, platform, lib , config, crossSystem, platform, lib
, pkgsWithOverrides, stdenvAdapters , pkgsWithOverrides
, ... }: , ... }:
self: pkgs: self: pkgs:
@ -74,7 +74,7 @@ in
### Helper functions. ### Helper functions.
inherit lib config stdenvAdapters; inherit lib config;
inherit (lib) lowPrio hiPrio appendToName makeOverridable; inherit (lib) lowPrio hiPrio appendToName makeOverridable;
inherit (misc) versionedDerivation; inherit (misc) versionedDerivation;

6
pkgs/top-level/default.nix
View File

@ -114,14 +114,16 @@ let
pkgsWithOverrides = overrider: pkgsWithOverrides = overrider:
let let
stdenvAdapters = stdenvAdapters =
import ../stdenv/adapters.nix pkgs; let res = import ../stdenv/adapters.nix pkgs; in res // {
stdenvAdapters = res;
};
trivialBuilders = trivialBuilders =
(import ../build-support/trivial-builders.nix { inherit lib; inherit (pkgs) stdenv; inherit (pkgs.xorg) lndir; }); (import ../build-support/trivial-builders.nix { inherit lib; inherit (pkgs) stdenv; inherit (pkgs.xorg) lndir; });
stdenvDefault = (import ./stdenv.nix topLevelArguments) {} pkgs; stdenvDefault = (import ./stdenv.nix topLevelArguments) {} pkgs;
selfArgs = topLevelArguments // { inherit pkgsWithOverrides stdenvAdapters; }; selfArgs = topLevelArguments // { inherit pkgsWithOverrides; };
self = (import ./all-packages.nix selfArgs) self pkgs; self = (import ./all-packages.nix selfArgs) self pkgs;
aliases = import ./aliases.nix self; aliases = import ./aliases.nix self;