Remove kde4.kde_gtk_config
- Already updated to KDE 5 in Nixpkgs - Not useful without the KDE 4 desktop
This commit is contained in:
parent
db5ab73ec8
commit
00dce4e29f
|
@ -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 ];
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -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
|
|
|
@ -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") {
|
|
|
@ -16721,8 +16721,6 @@ with pkgs;
|
||||||
|
|
||||||
kbibtex = callPackage ../applications/office/kbibtex { };
|
kbibtex = callPackage ../applications/office/kbibtex { };
|
||||||
|
|
||||||
kde_gtk_config = callPackage ../tools/misc/kde-gtk-config { };
|
|
||||||
|
|
||||||
kde_wacomtablet = callPackage ../applications/misc/kde-wacomtablet { };
|
kde_wacomtablet = callPackage ../applications/misc/kde-wacomtablet { };
|
||||||
|
|
||||||
kdenlive = callPackage ../applications/video/kdenlive { mlt = mlt-qt4; };
|
kdenlive = callPackage ../applications/video/kdenlive { mlt = mlt-qt4; };
|
||||||
|
|
Loading…
Reference in a new issue