diff options
| author | Linus Heckemann <git@sphalerite.org> | 2023-12-20 10:27:59 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-20 10:27:59 +0000 |
| commit | 3dfe4476be1e8773279957b6a794bb7a3772ce2b (patch) | |
| tree | e7695527537361e250a20c92874381e57742103f /pkgs/desktops/plasma-5 | |
| parent | 178cd09cc15863738c2ba79b19287ea8c68d2127 (diff) | |
| parent | 2b122abc406018898e143985d5fe92dc20f4dee9 (diff) | |
Merge pull request #270266 from SuperSandro2000/plasma-gtk2-gone
Remove GTK2 from a typical plasma installation
Diffstat (limited to 'pkgs/desktops/plasma-5')
| -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 b499ab034e508..3ecc5d5e5b0d1 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 a61fc328236d2..c55193ae6429a 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 |