about summary refs log tree commit diff
path: root/overlays
diff options
context:
space:
mode:
authoradisbladis <adisbladis@gmail.com>2022-12-19 14:28:16 +1300
committerGitHub <noreply@github.com>2022-12-19 14:28:16 +1300
commit838a1eb25552b93841ba025c02c2a98062fcf22f (patch)
treefdf92510c2fb3dd1feea42a3c5c7708c4000232c /overlays
parent233d2937a35960459f8d0958548fccf67c060330 (diff)
parentea098ae4c4e43ae76f2c5a39ab614749fe28e99f (diff)
downloadnixlib-838a1eb25552b93841ba025c02c2a98062fcf22f.tar
nixlib-838a1eb25552b93841ba025c02c2a98062fcf22f.tar.gz
nixlib-838a1eb25552b93841ba025c02c2a98062fcf22f.tar.bz2
nixlib-838a1eb25552b93841ba025c02c2a98062fcf22f.tar.lz
nixlib-838a1eb25552b93841ba025c02c2a98062fcf22f.tar.xz
nixlib-838a1eb25552b93841ba025c02c2a98062fcf22f.tar.zst
nixlib-838a1eb25552b93841ba025c02c2a98062fcf22f.zip
Merge pull request #282 from fbergroth/fix-pgtk
Use withPgtk = true in emacsPgtk
Diffstat (limited to 'overlays')
-rw-r--r--overlays/emacs.nix10
1 files changed, 1 insertions, 9 deletions
diff --git a/overlays/emacs.nix b/overlays/emacs.nix
index d949874f775f..60d41957ee7c 100644
--- a/overlays/emacs.nix
+++ b/overlays/emacs.nix
@@ -124,17 +124,9 @@ 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 { withSQLite3 = true; withWebP = true; };
 
-  emacsPgtk = mkPgtkEmacs "emacs-pgtk" ../repos/emacs/emacs-master.json { withSQLite3 = true; withWebP = true; withGTK3 = true; };
+  emacsPgtk = mkGitEmacs "emacs-pgtk" ../repos/emacs/emacs-master.json { withSQLite3 = true; withWebP = true; withPgtk = true; };
 
   emacsUnstable = (mkGitEmacs "emacs-unstable" ../repos/emacs/emacs-unstable.json { noTreeSitter = true; });