diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-12-20 12:00:53 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-20 12:00:53 +0000 |
| commit | 176c80219db0befaadf84838560f59f088f49646 (patch) | |
| tree | b1681ed74bf3ae07c5aaf7038547b70ee9de1697 /pkgs/desktops | |
| parent | d6f7a57f9fb974b3ea47cc8bec0db98de6f3ecec (diff) | |
| parent | 6b25f0686e4ecd27d76cda06103453c5b875ddd4 (diff) | |
| download | nixlib-176c80219db0befaadf84838560f59f088f49646.tar nixlib-176c80219db0befaadf84838560f59f088f49646.tar.gz nixlib-176c80219db0befaadf84838560f59f088f49646.tar.bz2 nixlib-176c80219db0befaadf84838560f59f088f49646.tar.lz nixlib-176c80219db0befaadf84838560f59f088f49646.tar.xz nixlib-176c80219db0befaadf84838560f59f088f49646.tar.zst nixlib-176c80219db0befaadf84838560f59f088f49646.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/plasma-5/breeze-gtk.nix | 8 | ||||
| -rw-r--r-- | pkgs/desktops/plasma-5/kde-gtk-config/default.nix | 3 |
2 files changed, 1 insertions, 10 deletions
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 |