diff options
author | Nicolas B. Pierron <nicolas.b.pierron@gmail.com> | 2016-03-20 19:18:33 +0000 |
---|---|---|
committer | Nicolas B. Pierron <nicolas.b.pierron@gmail.com> | 2016-03-20 19:18:33 +0000 |
commit | 1bcefcdf5caf5f238abd9cc74f4d9738ad505f29 (patch) | |
tree | c36f6044ab8055a6bf1142bbce24702f59e92bf0 /pkgs/top-level/default.nix | |
parent | 800766fb0b26991a19b63487dceaf369aec92138 (diff) |
Under pkgsWithOverrides, replace the last uses of pkgs by the corresponding argument.
Diffstat (limited to 'pkgs/top-level/default.nix')
-rw-r--r-- | pkgs/top-level/default.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix index b1d1282d3d64..d335ffb8a377 100644 --- a/pkgs/top-level/default.nix +++ b/pkgs/top-level/default.nix @@ -114,18 +114,20 @@ let pkgsWithOverrides = overrider: let stdenvAdapters = self: super: - let res = import ../stdenv/adapters.nix pkgs; in res // { + let res = import ../stdenv/adapters.nix self; in res // { stdenvAdapters = res; }; 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; allPackagesArgs = topLevelArguments // { inherit pkgsWithOverrides; }; allPackages = self: super: - let res = import ./all-packages.nix allPackagesArgs res pkgs; + let res = import ./all-packages.nix allPackagesArgs res self; in res; aliases = self: super: import ./aliases.nix super; |