diff options
Diffstat (limited to 'nixpkgs/pkgs/desktops/plasma-5/kde-gtk-config/default.nix')
-rw-r--r-- | nixpkgs/pkgs/desktops/plasma-5/kde-gtk-config/default.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/nixpkgs/pkgs/desktops/plasma-5/kde-gtk-config/default.nix b/nixpkgs/pkgs/desktops/plasma-5/kde-gtk-config/default.nix index 8cfc947d30b..c1ed6dbd6c6 100644 --- a/nixpkgs/pkgs/desktops/plasma-5/kde-gtk-config/default.nix +++ b/nixpkgs/pkgs/desktops/plasma-5/kde-gtk-config/default.nix @@ -2,7 +2,7 @@ mkDerivation, extra-cmake-modules, wrapGAppsHook, glib, gtk2, gtk3, karchive, kcmutils, kconfigwidgets, ki18n, kiconthemes, kio, - knewstuff, gsettings-desktop-schemas + knewstuff, gsettings-desktop-schemas, xsettingsd }: mkDerivation { @@ -11,14 +11,16 @@ mkDerivation { dontWrapGApps = true; # There is nothing to wrap buildInputs = [ ki18n kio glib gtk2 gtk3 karchive kcmutils kconfigwidgets kiconthemes - knewstuff gsettings-desktop-schemas + knewstuff gsettings-desktop-schemas xsettingsd ]; - patches = [ ./patches/follow-symlinks.patch ./patches/gsettings.patch ]; 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 + # aren't found. + patches = [ ./0001-gsettings-schemas-path.patch ]; preConfigure = '' NIX_CFLAGS_COMPILE+=" -DGSETTINGS_SCHEMAS_PATH=\"$GSETTINGS_SCHEMAS_PATH\"" ''; |