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

top-level: Inline topLevelArugments, and make pkg named arg for stdenv

Browse Source 
[Trying my best to indent properly while avoiding excessive drift]
This commit is contained in:
John Ericson 2016-11-02 18:35:03 -04:00
parent 05977b236b
commit 68a04c1195
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -56,10 +56,6 @@ let
platform = if platform_ != null then platform_
else config.platform or platformAuto;
topLevelArguments = {
inherit system bootStdenv noSysDirs config crossSystem platform lib nixpkgsFun;
};
# A few packages make a new package set to draw their dependencies from.
# (Currently to get a cross tool chain, or forced-i686 package.) Rather than
# give `all-packages.nix` all the arguments to this function, even ones that
@ -81,10 +77,15 @@ let
inherit lib; inherit (self) stdenv stdenvNoCC; inherit (self.xorg) lndir;
};
stdenvDefault = self: super: (import ./stdenv.nix topLevelArguments) pkgs;
stdenvDefault = self: super:
import ./stdenv.nix {
inherit system bootStdenv noSysDirs config crossSystem platform lib nixpkgsFun pkgs;
};
allPackages = self: super:
let res = import ./all-packages.nix topLevelArguments res self;
let res = import ./all-packages.nix
{ inherit system bootStdenv noSysDirs config crossSystem platform lib nixpkgsFun; }
res self;
in res;
aliases = self: super: import ./aliases.nix super;

3
pkgs/top-level/stdenv.nix
View File

@ -1,5 +1,4 @@
{ system, bootStdenv, crossSystem, config, platform, lib, nixpkgsFun, ... }:
pkgs:
{ system, bootStdenv, crossSystem, config, platform, lib, nixpkgsFun, pkgs, ... }:
rec {
allStdenvs = import ../stdenv {