From 3cba3fe7341611e8f7ebe047f38a82e852c1231d Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Thu, 15 Sep 2022 22:10:05 -0700 Subject: [PATCH] Use upstream withPgtk input attribute and remove mkPgtkEmacs --- default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/default.nix b/default.nix index f13bf9733..815e4067b 100644 --- a/default.nix +++ b/default.nix @@ -75,13 +75,6 @@ let ) ]; - mkPgtkEmacs = namePrefix: jsonFile: { ... }@args: (mkGitEmacs namePrefix jsonFile args).overrideAttrs ( - old: { - configureFlags = (super.lib.remove "--with-xft" old.configureFlags) - ++ super.lib.singleton "--with-pgtk"; - } - ); - emacsGit = mkGitEmacs "emacs-git" ./repos/emacs/emacs-master.json { }; emacsNativeComp = super.emacsNativeComp or (mkGitEmacs "emacs-native-comp" ./repos/emacs/emacs-unstable.json { nativeComp = true; }); @@ -90,9 +83,9 @@ let nativeComp = true; }; - emacsPgtk = mkPgtkEmacs "emacs-pgtk" ./repos/emacs/emacs-master.json { withGTK3 = true; }; + emacsPgtk = mkGitEmacs "emacs-pgtk" ./repos/emacs/emacs-master.json { withPgtk = true; }; - emacsPgtkNativeComp = mkPgtkEmacs "emacs-pgtk-native-comp" ./repos/emacs/emacs-master.json { nativeComp = true; withGTK3 = true; }; + emacsPgtkNativeComp = mkGitEmacs "emacs-pgtk-native-comp" ./repos/emacs/emacs-master.json { nativeComp = true; withPgtk = true; }; emacsUnstable = (mkGitEmacs "emacs-unstable" ./repos/emacs/emacs-unstable.json { });