public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests 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
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/top-level/default.nix
+4 -2
View File
@@ -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;