nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 15:03:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

top-level: Only splice as needed for performance

Browse Source
This commit is contained in:
John Ericson 2017-01-15 18:03:59 -05:00
parent 4c17cd555f
commit bfb147b6a8
3 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/stdenv/booter.nix
View File

@ -63,12 +63,11 @@ stageFuns: let
__bootPackages = finalSoFar; __bootPackages = finalSoFar;
}; };
}; };
self = in
if args.__raw or false if args.__raw or false
then args' then args'
else allPackages ((builtins.removeAttrs args' ["selfBuild"]) // { else allPackages ((builtins.removeAttrs args' ["selfBuild"]) // {
buildPackages = if args.selfBuild or true then self else finalSoFar; buildPackages = if args.selfBuild or true then null else finalSoFar;
}); });
in self;
in lib.lists.fold folder {} withAllowCustomOverrides in lib.lists.fold folder {} withAllowCustomOverrides

11
pkgs/top-level/splice.nix
View File

@ -17,7 +17,11 @@
# `mkDerivation` knows how to pull out the right ones for `buildDepends` and # `mkDerivation` knows how to pull out the right ones for `buildDepends` and
# friends, but a few packages use them directly, so it seemed efficient (to # friends, but a few packages use them directly, so it seemed efficient (to
# @Ericson2314) to reuse those names, at least initially, to minimize breakage. # @Ericson2314) to reuse those names, at least initially, to minimize breakage.
lib: pkgs: #
# For performance reasons, rather than uniformally splice in all cases, we only
# do so when `pkgs` and `buildPackages` are distinct. The `actuallySplice`
# parameter there the boolean value of that equality check.
lib: pkgs: actuallySplice:
let let
defaultBuildScope = pkgs.buildPackages // pkgs.buildPackages.xorg; defaultBuildScope = pkgs.buildPackages // pkgs.buildPackages.xorg;
@ -58,7 +62,10 @@ let
}; };
in lib.listToAttrs (map merge (lib.attrNames mash)); in lib.listToAttrs (map merge (lib.attrNames mash));
splicedPackages = splicer defaultBuildScope defaultRunScope; splicedPackages =
if actuallySplice
then splicer defaultBuildScope defaultRunScope
else pkgs // pkgs.xorg;
in in

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

@ -45,7 +45,8 @@
## Other parameters ## Other parameters
## ##
, # The package set used at build-time , # The package set used at build-time. If null, `buildPackages` will
# be defined internally as the produced package set as itself.
buildPackages buildPackages
, # The standard environment to use for building packages. , # The standard environment to use for building packages.
@ -84,7 +85,8 @@ let
}; };
stdenvBootstappingAndPlatforms = self: super: { stdenvBootstappingAndPlatforms = self: super: {
buildPackages = buildPackages // { recurseForDerivations = false; }; buildPackages = (if buildPackages == null then self else buildPackages)
// { recurseForDerivations = false; };
inherit stdenv inherit stdenv
buildPlatform hostPlatform targetPlatform; buildPlatform hostPlatform targetPlatform;
}; };
@ -103,7 +105,7 @@ let
inherit (buildPlatform) system platform; inherit (buildPlatform) system platform;
}; };
splice = self: super: import ./splice.nix lib self; splice = self: super: import ./splice.nix lib self (buildPackages != null);
allPackages = self: super: allPackages = self: super:
let res = import ./all-packages.nix let res = import ./all-packages.nix