summary refs log tree commit diff
diff options
context:
space:
mode:
authorThomas Tuegel <ttuegel@mailbox.org>2017-02-18 12:57:18 -0600
committerThomas Tuegel <ttuegel@mailbox.org>2017-02-24 16:49:00 -0600
commit00dce4e29f2195b49a19b9c44a93f44244e7664e (patch)
treeacf11ffb851633ac733e6f877099c7603ed98e6d
parentdb5ab73ec89c5221936e992aac9445ba8c68de38 (diff)
downloadnixlib-00dce4e29f2195b49a19b9c44a93f44244e7664e.tar
nixlib-00dce4e29f2195b49a19b9c44a93f44244e7664e.tar.gz
nixlib-00dce4e29f2195b49a19b9c44a93f44244e7664e.tar.bz2
nixlib-00dce4e29f2195b49a19b9c44a93f44244e7664e.tar.lz
nixlib-00dce4e29f2195b49a19b9c44a93f44244e7664e.tar.xz
nixlib-00dce4e29f2195b49a19b9c44a93f44244e7664e.tar.zst
nixlib-00dce4e29f2195b49a19b9c44a93f44244e7664e.zip
Remove kde4.kde_gtk_config
- Already updated to KDE 5 in Nixpkgs
- Not useful without the KDE 4 desktop
-rw-r--r--pkgs/tools/misc/kde-gtk-config/default.nix47
-rw-r--r--pkgs/tools/misc/kde-gtk-config/kde-gtk-config-2.2.1-install-paths.patch28
-rw-r--r--pkgs/tools/misc/kde-gtk-config/kde-gtk-config-follow-symlinks.patch13
-rw-r--r--pkgs/top-level/all-packages.nix2
4 files changed, 0 insertions, 90 deletions
diff --git a/pkgs/tools/misc/kde-gtk-config/default.nix b/pkgs/tools/misc/kde-gtk-config/default.nix
deleted file mode 100644
index 41aaad553463..000000000000
--- a/pkgs/tools/misc/kde-gtk-config/default.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig
-, gtk2, gtk3, kdelibs, libxcb, libpthreadstubs, libXdmcp
-, 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 = [
-    gdk_pixbuf glib gtk2 gtk3 kdelibs libxcb libpthreadstubs libXdmcp
-  ];
-
-  nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ];
-
-  patches = [
-    ./kde-gtk-config-2.2.1-install-paths.patch
-    ./kde-gtk-config-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
-    -DGTK2_INCLUDE_DIRS=${gtk2.dev}/include/gtk-2.0
-    -DKDE4_LIBEXEC_INSTALL_DIR=lib/kde4/libexec
-  '';
-
-  meta = with stdenv.lib; {
-    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 = platforms.linux;
-    license = licenses.gpl3;
-    maintainers = [ maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/tools/misc/kde-gtk-config/kde-gtk-config-2.2.1-install-paths.patch b/pkgs/tools/misc/kde-gtk-config/kde-gtk-config-2.2.1-install-paths.patch
deleted file mode 100644
index e6596ef0dcc7..000000000000
--- a/pkgs/tools/misc/kde-gtk-config/kde-gtk-config-2.2.1-install-paths.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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
diff --git a/pkgs/tools/misc/kde-gtk-config/kde-gtk-config-follow-symlinks.patch b/pkgs/tools/misc/kde-gtk-config/kde-gtk-config-follow-symlinks.patch
deleted file mode 100644
index e291589e82e3..000000000000
--- a/pkgs/tools/misc/kde-gtk-config/kde-gtk-config-follow-symlinks.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/appearancegtk2.cpp b/src/appearancegtk2.cpp
-index 3d89c82..4dcce69 100644
---- a/src/appearancegtk2.cpp
-+++ b/src/appearancegtk2.cpp
-@@ -56,7 +56,7 @@ QString AppearanceGTK2::themesGtkrcFile(const QString& themeName) const
-     QStringList themes=installedThemes();
-     themes=themes.filter(QRegExp("/"+themeName+"/?$"));
-     if(themes.size()==1) {
--        QDirIterator it(themes.first(), QDirIterator::Subdirectories);
-+        QDirIterator it(themes.first(), QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
-         while(it.hasNext()) {
-             it.next();
-             if(it.fileName()=="gtkrc") {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 919d6c80d7c9..fd0919ca3d4d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16721,8 +16721,6 @@ with pkgs;
 
         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 { mlt = mlt-qt4; };