diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index df04ceaf2c75..faf06ca843c7 100644 --- a/pkgs/applications/editors/emacs/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -20,10 +20,6 @@ lib.makeScope pkgs.newScope (self: emacs28 = callPackage (self.sources.emacs28) inheritedArgs; - emacs28-gtk2 = self.emacs28.override { - withGTK2 = true; - }; - emacs28-gtk3 = self.emacs28.override { withGTK3 = true; }; diff --git a/pkgs/applications/editors/emacs/make-emacs.nix b/pkgs/applications/editors/emacs/make-emacs.nix index ced468858760..cbcd022c3d35 100644 --- a/pkgs/applications/editors/emacs/make-emacs.nix +++ b/pkgs/applications/editors/emacs/make-emacs.nix @@ -22,7 +22,6 @@ , gnutls , gpm , gsettings-desktop-schemas -, gtk2-x11 , gtk3 , gtk3-x11 , harfbuzz @@ -69,7 +68,6 @@ , withAthena ? false , withCsrc ? true , withDbus ? stdenv.isLinux -, withGTK2 ? false , withGTK3 ? withPgtk && !noGui , withGlibNetworking ? withPgtk || withGTK3 || (withX && withXwidgets) , withGpm ? stdenv.isLinux @@ -95,8 +93,7 @@ # Options , siteStart ? ./site-start.el , toolkit ? ( - if withGTK2 then "gtk2" - else if withGTK3 then "gtk3" + if withGTK3 then "gtk3" else if withMotif then "motif" else if withAthena then "athena" else "lucid") @@ -117,14 +114,11 @@ , WebKit }: -assert (withGTK2 && !withNS && variant != "macport") -> withX; assert (withGTK3 && !withNS && variant != "macport") -> withX || withPgtk; -assert noGui -> !(withX || withGTK2 || withGTK3 || withNS || variant == "macport"); +assert noGui -> !(withX || withGTK3 || withNS || variant == "macport"); assert withAcl -> stdenv.isLinux; assert withAlsaLib -> stdenv.isLinux; -assert withGTK2 -> !(withGTK3 || withPgtk); -assert withGTK3 -> !withGTK2 || withPgtk; assert withGpm -> stdenv.isLinux; assert withNS -> stdenv.isDarwin && !(withX || variant == "macport"); assert withPgtk -> withGTK3 && !withX; @@ -148,7 +142,6 @@ mkDerivation (finalAttrs: { else if variant == "macport" then "-macport" else if withPgtk then "-pgtk" else if withGTK3 then "-gtk3" - else if withGTK2 then "-gtk2" else ""); inherit version; @@ -241,8 +234,6 @@ mkDerivation (finalAttrs: { ] ++ lib.optionals (stdenv.isLinux && withX) [ libotf m17n_lib - ] ++ lib.optionals (withX && withGTK2) [ - gtk2-x11 ] ++ lib.optionals (withX && withGTK3) [ gtk3-x11 ] ++ lib.optionals (withX && withMotif) [ diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 18957005dd3c..e50af1a6a24a 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -414,6 +414,7 @@ mapAliases { elixir_ls = elixir-ls; # Added 2023-03-20 # Emacs + emacs28-gtk2 = throw "emacs28-gtk2 was removed because GTK2 is EOL; migrate to emacs28{,-gtk3,-nox} or to more recent versions of Emacs."; # Added 2024-09-20 emacs28NativeComp = emacs28; # Added 2022-06-08 emacs28Packages = emacs28.pkgs; # Added 2021-10-04 emacs28WithPackages = emacs28.pkgs.withPackages; # Added 2021-10-04 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bcc9af48f461..09d644f76c64 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29195,7 +29195,6 @@ with pkgs; inherit (recurseIntoAttrs (callPackage ../applications/editors/emacs { })) emacs28 - emacs28-gtk2 emacs28-gtk3 emacs28-nox