about summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorJosé Romildo Malaquias <malaquias@gmail.com>2020-06-05 10:08:30 -0300
committerGitHub <noreply@github.com>2020-06-05 10:08:30 -0300
commite0e9b9fb0777c7de586aa0fe6cca8da601d0dbf9 (patch)
tree687089e4761230bf9d5e3ef6e074f27e761a880d /pkgs/top-level
parent8db1c35e830382c3d3fe1b8b14b4dada41185483 (diff)
parent9644b56c74b782a59af3bd0fbc6cc75fb23c23be (diff)
downloadnixlib-e0e9b9fb0777c7de586aa0fe6cca8da601d0dbf9.tar
nixlib-e0e9b9fb0777c7de586aa0fe6cca8da601d0dbf9.tar.gz
nixlib-e0e9b9fb0777c7de586aa0fe6cca8da601d0dbf9.tar.bz2
nixlib-e0e9b9fb0777c7de586aa0fe6cca8da601d0dbf9.tar.lz
nixlib-e0e9b9fb0777c7de586aa0fe6cca8da601d0dbf9.tar.xz
nixlib-e0e9b9fb0777c7de586aa0fe6cca8da601d0dbf9.tar.zst
nixlib-e0e9b9fb0777c7de586aa0fe6cca8da601d0dbf9.zip
Merge pull request #89420 from romildo/fix.lxappearance
lxappearance: default to Gtk3
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/aliases.nix1
-rw-r--r--pkgs/top-level/all-packages.nix9
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 30d9ce5bcfd8..1004a444469e 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -276,6 +276,7 @@ mapAliases ({
   lua5_1_sockets = lua51Packages.luasocket; # added 2017-05-02
   lua5_expat = luaPackages.luaexpat; # added 2017-05-02
   lua5_sec = luaPackages.luasec; # added 2017-05-02
+  lxappearance-gtk3 = throw "lxappearance-gtk3 has been removed. Use lxappearance instead, which now defaults to Gtk3";  # added 2020-06-03
   m3d-linux = m33-linux; # added 2016-08-13
   man_db = man-db; # added 2016-05
   manpages = man-pages; # added 2015-12-06
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2f4fe9578a01..e7fc5edf06b3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9507,12 +9507,11 @@ in
     nodejs = nodejs-13_x;
   };
 
-  lxappearance = callPackage ../desktops/lxde/core/lxappearance {
-    gtk2 = gtk2-x11;
-  };
+  lxappearance = callPackage ../desktops/lxde/core/lxappearance { };
 
-  lxappearance-gtk3 = lxappearance.override {
-    withGtk3 = true;
+  lxappearance-gtk2 = callPackage ../desktops/lxde/core/lxappearance {
+    gtk2 = gtk2-x11;
+    withGtk3 = false;
   };
 
   lxmenu-data = callPackage ../desktops/lxde/core/lxmenu-data.nix { };