axeman/pub-solar-os
1
0
Fork 0
forked from pub-solar/os
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #61 from blaggacao/da-separate-pkgs-from-overlays

Browse source 
ref: remove overlay xref to pkgs
This commit is contained in:
Timothy DeHerrera 2020-12-30 13:53:51 -07:00 committed by GitHub
parent 9f561b8cea 94f334ee8d
commit 09f0bbda70
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/utils.nix
View file

@ -85,11 +85,10 @@ in
genPackages = { overlay, overlays, pkgs }: genPackages = { overlay, overlays, pkgs }:
let let
packages = overlay pkgs pkgs; packages = overlay pkgs pkgs;
overlays' = lib.filterAttrs (n: v: n != "pkgs") overlays;
overlayPkgs = overlayPkgs =
genAttrs genAttrs
(attrNames overlays') (attrNames overlays)
(name: (overlays'."${name}" pkgs pkgs)."${name}"); (name: (overlays."${name}" pkgs pkgs)."${name}");
in in
recursiveUpdate packages overlayPkgs; recursiveUpdate packages overlayPkgs;

1
overlays/pkgs.nix
View file

@ -1 +0,0 @@
../pkgs/default.nix