diff options
| author | Andrew Childs <lorne@cons.org.nz> | 2018-08-21 00:08:52 +0900 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-10-11 15:03:07 -0400 |
| commit | 47bf3f3d3fac32432b182d83dbc59acc6fe54211 (patch) | |
| tree | 32e392b774f2f81239ca418fa40dcc6f1a5d98a5 /pkgs/top-level/splice.nix | |
| parent | fb9604c4b7aa3617791f3cab10624a79819c0e5e (diff) | |
| download | nixpkgs-47bf3f3d3fac32432b182d83dbc59acc6fe54211.tar nixpkgs-47bf3f3d3fac32432b182d83dbc59acc6fe54211.tar.gz nixpkgs-47bf3f3d3fac32432b182d83dbc59acc6fe54211.tar.bz2 nixpkgs-47bf3f3d3fac32432b182d83dbc59acc6fe54211.tar.lz nixpkgs-47bf3f3d3fac32432b182d83dbc59acc6fe54211.tar.xz nixpkgs-47bf3f3d3fac32432b182d83dbc59acc6fe54211.tar.zst nixpkgs-47bf3f3d3fac32432b182d83dbc59acc6fe54211.zip | |
xorg: don't splice scope attributes into main package set
Diffstat (limited to 'pkgs/top-level/splice.nix')
| -rw-r--r-- | pkgs/top-level/splice.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/top-level/splice.nix b/pkgs/top-level/splice.nix index 82a781083e2..ec6ed357c68 100644 --- a/pkgs/top-level/splice.nix +++ b/pkgs/top-level/splice.nix @@ -112,7 +112,9 @@ let inherit (pkgs.stdenv) buildPlatform targetPlatform hostPlatform; }; - splicedPackagesWithXorg = splicedPackages // splicedPackages.xorg; + splicedPackagesWithXorg = splicedPackages // builtins.removeAttrs splicedPackages.xorg [ + "callPackage" "newScope" "overrideScope" "packages" + ]; in |