about summary refs log tree commit diff
path: root/overlays
diff options
context:
space:
mode:
authorArchit Gupta <archit@accelbread.com>2023-01-12 22:32:45 -0800
committerArchit Gupta <archit@accelbread.com>2023-01-12 22:32:45 -0800
commit699dd6e9999e3977490eb75490f1fa155fa5c319 (patch)
tree89c54f02e2911d240406dc1d7b34e23e439a0cb5 /overlays
parentf31b9a13f881c0e8bc844fa8273daef2128f9510 (diff)
downloadnixlib-699dd6e9999e3977490eb75490f1fa155fa5c319.tar
nixlib-699dd6e9999e3977490eb75490f1fa155fa5c319.tar.gz
nixlib-699dd6e9999e3977490eb75490f1fa155fa5c319.tar.bz2
nixlib-699dd6e9999e3977490eb75490f1fa155fa5c319.tar.lz
nixlib-699dd6e9999e3977490eb75490f1fa155fa5c319.tar.xz
nixlib-699dd6e9999e3977490eb75490f1fa155fa5c319.tar.zst
nixlib-699dd6e9999e3977490eb75490f1fa155fa5c319.zip
Remove special casing for nongnuPackages
Diffstat (limited to 'overlays')
-rw-r--r--overlays/package.nix14
1 files changed, 7 insertions, 7 deletions
diff --git a/overlays/package.nix b/overlays/package.nix
index f85fd8f14053..0a07cf99a239 100644
--- a/overlays/package.nix
+++ b/overlays/package.nix
@@ -42,17 +42,17 @@ in
             generated = ../repos/elpa/elpa-generated.nix;
           };
 
+          nongnuPackages = esuper.nongnuPackages.override {
+            generated = ../repos/nongnu/nongnu-generated.nix;
+          };
+
           epkgs = esuper.override {
-            inherit melpaStablePackages melpaPackages elpaPackages;
+            inherit melpaStablePackages melpaPackages elpaPackages
+              nongnuPackages;
           };
 
         in
-        epkgs
-        // super.lib.optionalAttrs (super.lib.hasAttr "nongnuPackages" esuper) {
-          nongnuPackages = esuper.nongnuPackages.override {
-            generated = ../repos/nongnu/nongnu-generated.nix;
-          };
-        } // {
+        epkgs // {
           xelb = mkExDrv eself "xelb" {
             packageRequires = [ eself.cl-generic eself.emacs ];
           };