Use upstream withPgtk input attribute and remove mkPgtkEmacs

This commit is contained in:
Brian Leung 2022-09-15 22:10:05 -07:00
parent ca91042729
commit 3cba3fe734
No known key found for this signature in database
GPG key ID: 2D86D6A94C8BB3B1

View file

@ -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 { });