diff options
Diffstat (limited to 'pkgs/desktops')
-rw-r--r-- | pkgs/desktops/cinnamon/cinnamon-common/default.nix | 4 | ||||
-rw-r--r-- | pkgs/desktops/cinnamon/nemo/default.nix | 4 | ||||
-rw-r--r-- | pkgs/desktops/plasma-5/breeze-gtk.nix | 8 | ||||
-rw-r--r-- | pkgs/desktops/plasma-5/kde-gtk-config/default.nix | 3 |
4 files changed, 5 insertions, 14 deletions
diff --git a/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/pkgs/desktops/cinnamon/cinnamon-common/default.nix index 678bcfcd14cd..2d3d3be5092f 100644 --- a/pkgs/desktops/cinnamon/cinnamon-common/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-common/default.nix @@ -71,13 +71,13 @@ let in stdenv.mkDerivation rec { pname = "cinnamon-common"; - version = "6.0.1"; + version = "6.0.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = "cinnamon"; rev = version; - hash = "sha256-QEJNBQnj4vXZim5HsRY15VU2CBbnsw/jtSP9JRbWpog="; + hash = "sha256-/kjl/0Qdro6H3fMfs1dA0Zf/GT5Z4s6kK4vB+EBKw0g="; }; patches = [ diff --git a/pkgs/desktops/cinnamon/nemo/default.nix b/pkgs/desktops/cinnamon/nemo/default.nix index 406bcd132511..202bfa19af39 100644 --- a/pkgs/desktops/cinnamon/nemo/default.nix +++ b/pkgs/desktops/cinnamon/nemo/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "nemo"; - version = "6.0.0"; + version = "6.0.1"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-JeiBhgfGyGyNT9eNhtUl6Pp1jgG02NRlm5lam592lS0="; + sha256 = "sha256-3iGwpHuZrRBd35nAa3x1Lu/KDS1L42y5u8A4vM41b0Q="; }; patches = [ diff --git a/pkgs/desktops/plasma-5/breeze-gtk.nix b/pkgs/desktops/plasma-5/breeze-gtk.nix index b499ab034e50..3ecc5d5e5b0d 100644 --- a/pkgs/desktops/plasma-5/breeze-gtk.nix +++ b/pkgs/desktops/plasma-5/breeze-gtk.nix @@ -1,6 +1,4 @@ -{ mkDerivation, lib, extra-cmake-modules, gtk2, qtbase, sassc, python3, breeze-qt5 }: - -let inherit (lib) getLib; in +{ mkDerivation, extra-cmake-modules, qtbase, sassc, python3, breeze-qt5 }: mkDerivation { pname = "breeze-gtk"; @@ -9,9 +7,5 @@ mkDerivation { patches = [ ./patches/0001-fix-add-executable-bit.patch ]; - postPatch = '' - sed -i cmake/FindGTKEngine.cmake \ - -e "s|\''${KDE_INSTALL_FULL_LIBDIR}|${getLib gtk2}/lib|" - ''; cmakeFlags = [ "-DWITH_GTK3_VERSION=3.22" ]; } diff --git a/pkgs/desktops/plasma-5/kde-gtk-config/default.nix b/pkgs/desktops/plasma-5/kde-gtk-config/default.nix index a61fc328236d..c55193ae6429 100644 --- a/pkgs/desktops/plasma-5/kde-gtk-config/default.nix +++ b/pkgs/desktops/plasma-5/kde-gtk-config/default.nix @@ -2,7 +2,6 @@ , extra-cmake-modules , wrapGAppsHook , glib -, gtk2 , gtk3 , karchive , kcmutils @@ -25,7 +24,6 @@ mkDerivation { ki18n kio glib - gtk2 gtk3 karchive kcmutils @@ -39,7 +37,6 @@ mkDerivation { ]; cmakeFlags = [ "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include" - "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include" "-DGLIB_SCHEMAS_DIR=${gsettings-desktop-schemas.out}/" ]; # The gtkconfig KDED module will crash the daemon if the GSettings schemas |