Merge pull request #1443 from ttuegel/kde-gtk-config

add kde-gtk-config-2.2.1

pkgs/tools/misc/kde-gtk-config/default.nix

@@ -0,0 +1,49 @@
+{ stdenv, fetchurl, cmake, gettext, gtk2, gtk3, kdelibs
+, libxcb, libpthreadstubs, libXdmcp, pkgconfig, glib, gdk_pixbuf }:
+
+stdenv.mkDerivation {
+  name = "kde-gtk-config-2.2.1";
+  src = fetchurl {
+    url = "mirror://kde/stable/kde-gtk-config/2.2.1/src/kde-gtk-config-2.2.1.tar.xz";
+    sha256 = "11aw86jcjcg3ywnzrxy9x8dvd73my18k0if52fnvyvmb75z0v2cw";
+  };
+
+  buildInputs = [
+    cmake
+    gdk_pixbuf
+    gettext
+    glib
+    gtk2
+    gtk3
+    kdelibs
+    libxcb
+    libpthreadstubs
+    libXdmcp
+    pkgconfig
+  ];
+
+  patches = [ ./kde-gtk-config-2.2.1-install-paths.patch ];
+
+  cmakeFlags = ''
+    -DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib}/lib/glib-2.0/include
+    -DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2}/lib/gtk-2.0/include
+    -DGTK2_INCLUDE_DIRS=${gtk2}/include/gtk-2.0
+    -DKDE4_LIBEXEC_INSTALL_DIR=lib/kde4/libexec
+  '';
+
+  meta = {
+    homepage = https://projects.kde.org/projects/extragear/base/kde-gtk-config;
+    description = "GTK configuration module for KDE System Settings";
+    longDescription = ''
+      Configuration dialog to adapt GTK applications appearance to your taste under KDE.
+      Among its many features, it lets you:
+      - Choose which theme is used for GTK2 and GTK3 applications.
+      - Tweak some GTK applications behaviour.
+      - Select what icon theme to use in GTK applications.
+      - Select GTK applications default fonts.
+      - Easily browse and install new GTK2 and GTK3 themes.
+    '';
+    platforms = stdenv.lib.platforms.linux;
+    license = "GPLv3";
+  };
+}

pkgs/tools/misc/kde-gtk-config/kde-gtk-config-2.2.1-install-paths.patch

@@ -0,0 +1,28 @@
+diff -ur kde-gtk-config-2.2.1-a/gtk3proxies/CMakeLists.txt kde-gtk-config-2.2.1-b/gtk3proxies/CMakeLists.txt
+--- kde-gtk-config-2.2.1-a/gtk3proxies/CMakeLists.txt	2013-03-18 06:02:39.000000000 -0500
++++ kde-gtk-config-2.2.1-b/gtk3proxies/CMakeLists.txt	2013-12-24 18:57:59.854264894 -0600
+@@ -6,4 +6,4 @@
+ 
+ add_executable(gtk3_preview preview3.c)
+ target_link_libraries(gtk3_preview ${GTK3_LIBRARY} ${GOBJECT2_LIBRARY} ${GLIB2_LIBRARY})
+-install(TARGETS gtk3_preview  RUNTIME DESTINATION "${KDE4_LIBEXEC_INSTALL_DIR}")
++install(TARGETS gtk3_preview  RUNTIME DESTINATION bin)
+diff -ur kde-gtk-config-2.2.1-a/gtkproxies/CMakeLists.txt kde-gtk-config-2.2.1-b/gtkproxies/CMakeLists.txt
+--- kde-gtk-config-2.2.1-a/gtkproxies/CMakeLists.txt	2013-03-18 06:02:39.000000000 -0500
++++ kde-gtk-config-2.2.1-b/gtkproxies/CMakeLists.txt	2013-12-24 18:57:40.967781611 -0600
+@@ -4,13 +4,13 @@
+ 
+ add_executable(reload_gtk_apps reload.c)
+ target_link_libraries(reload_gtk_apps ${GTK2_LIBRARIES})
+-install(TARGETS reload_gtk_apps RUNTIME DESTINATION "${KDE4_LIBEXEC_INSTALL_DIR}")
++install(TARGETS reload_gtk_apps RUNTIME DESTINATION bin)
+ 
+ add_definitions("-DDATA_DIR=\\\"${DATA_INSTALL_DIR}/kcm-gtk-module/\\\"")
+ 
+ add_executable(gtk_preview preview.c)
+ target_link_libraries(gtk_preview ${GTK2_LIBRARIES} ${GTK2_GIOMM_LIBRARY})
+-install(TARGETS gtk_preview RUNTIME DESTINATION "${KDE4_LIBEXEC_INSTALL_DIR}")
++install(TARGETS gtk_preview RUNTIME DESTINATION bin)
+ 
+ # preview file used for the gtk3 version too
+ install(FILES preview.ui

pkgs/top-level/all-packages.nix

@@ -9725,6 +9725,8 @@ let
 
       kbibtex = callPackage ../applications/office/kbibtex { };
 
+      kde_gtk_config = callPackage ../tools/misc/kde-gtk-config { };
+
       kde_wacomtablet = callPackage ../applications/misc/kde-wacomtablet { };
 
       kdenlive = callPackage ../applications/video/kdenlive { };