diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2018-02-26 10:50:18 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-02-26 10:50:18 +0100 |
commit | 4f08b0fbac17c201216abbd776ce3bb292ed4946 (patch) | |
tree | 129bb0b85b424612237e81d2cf303f7d5c0200fe /pkgs/desktops/plasma-5/kde-gtk-config/default.nix | |
parent | 6b381d4c9bed35caee62265a92986cec189243b2 (diff) | |
parent | 1d6abdd1775d12f7a90414c6e6b4c45ffc612246 (diff) | |
download | nixpkgs-4f08b0fbac17c201216abbd776ce3bb292ed4946.tar nixpkgs-4f08b0fbac17c201216abbd776ce3bb292ed4946.tar.gz nixpkgs-4f08b0fbac17c201216abbd776ce3bb292ed4946.tar.bz2 nixpkgs-4f08b0fbac17c201216abbd776ce3bb292ed4946.tar.lz nixpkgs-4f08b0fbac17c201216abbd776ce3bb292ed4946.tar.xz nixpkgs-4f08b0fbac17c201216abbd776ce3bb292ed4946.tar.zst nixpkgs-4f08b0fbac17c201216abbd776ce3bb292ed4946.zip |
Merge remote-tracking branch 'upstream/master' into HEAD
Diffstat (limited to 'pkgs/desktops/plasma-5/kde-gtk-config/default.nix')
-rw-r--r-- | pkgs/desktops/plasma-5/kde-gtk-config/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/desktops/plasma-5/kde-gtk-config/default.nix b/pkgs/desktops/plasma-5/kde-gtk-config/default.nix index f792f3b939f..35d90a246bc 100644 --- a/pkgs/desktops/plasma-5/kde-gtk-config/default.nix +++ b/pkgs/desktops/plasma-5/kde-gtk-config/default.nix @@ -2,7 +2,7 @@ mkDerivation, extra-cmake-modules, glib, gtk2, gtk3, karchive, kcmutils, kconfigwidgets, ki18n, kiconthemes, kio, - knewstuff, gsettings_desktop_schemas + knewstuff, gsettings-desktop-schemas }: mkDerivation { @@ -10,12 +10,12 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ ki18n kio glib gtk2 gtk3 karchive kcmutils kconfigwidgets kiconthemes - knewstuff gsettings_desktop_schemas + knewstuff gsettings-desktop-schemas ]; patches = [ ./0001-follow-symlinks.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}/" + "-DGLIB_SCHEMAS_DIR=${gsettings-desktop-schemas.out}/" ]; } |