From af8f87a3a124c7db1506119b379d673d1982e4c9 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 6 Feb 2017 18:13:02 -0500 Subject: [PATCH] top-level: Do not splice `pkgs`, `buildPackages` or `*Platform` - `pkgs` is self-similar, and thus already spliced - `buildPackages` is an ingredient of splicing and should be kept as is - The platforms are not packages or package sets and couldn't be spliced There's probably other things that shouldn't be spliced too. The best long- term solution is simply to stop splicing altogether. --- pkgs/top-level/splice.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/splice.nix b/pkgs/top-level/splice.nix index a22587d5b576..bb6fc47b1d2b 100644 --- a/pkgs/top-level/splice.nix +++ b/pkgs/top-level/splice.nix @@ -64,7 +64,11 @@ let splicedPackages = if actuallySplice - then splicer defaultBuildScope defaultRunScope + then splicer defaultBuildScope defaultRunScope // { + # These should never be spliced under any circumstances + inherit (pkgs) pkgs buildPackages + buildPlatform targetPlatform hostPlatform; + } else pkgs // pkgs.xorg; in