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

Under pkgsWithOverrides, replace the last uses of pkgs by the corresponding argument.

Browse Source
This commit is contained in:
Nicolas B. Pierron 2016-03-20 19:18:33 +00:00
parent 800766fb0b
commit 1bcefcdf5c
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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