From 699dd6e9999e3977490eb75490f1fa155fa5c319 Mon Sep 17 00:00:00 2001
From: Archit Gupta <archit@accelbread.com>
Date: Thu, 12 Jan 2023 22:32:45 -0800
Subject: Remove special casing for nongnuPackages

---
 overlays/package.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'overlays')

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 ];
           };
-- 
cgit 1.4.1