From 36b7499885ac6c7eaee4b22d0bdc4200bc4b5680 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 28 Dec 2013 09:42:10 -0600 Subject: [PATCH] add qtcurve-1.8.17 --- pkgs/misc/themes/qtcurve/default.nix | 37 +++++++++++++++++++ .../qtcurve-1.8.17-install-paths.patch | 25 +++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 3 files changed, 66 insertions(+) create mode 100644 pkgs/misc/themes/qtcurve/default.nix create mode 100644 pkgs/misc/themes/qtcurve/qtcurve-1.8.17-install-paths.patch diff --git a/pkgs/misc/themes/qtcurve/default.nix b/pkgs/misc/themes/qtcurve/default.nix new file mode 100644 index 00000000000..017a47349a9 --- /dev/null +++ b/pkgs/misc/themes/qtcurve/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchurl, cmake, gettext, gtk2, kde_workspace, kdelibs, libpthreadstubs, libXdmcp +, libxcb, pkgconfig, xlibs }: + +stdenv.mkDerivation { + name = "qtcurve-1.8.17"; + src = fetchurl { + url = "https://github.com/QtCurve/qtcurve/archive/1.8.17.tar.gz"; + sha256 = "1ixgill9lfhmcfsk5csk6ww3ljzbvb4x48m73apprv949xgr4wyn"; + }; + + buildInputs = [ + cmake + gettext + gtk2 + kde_workspace + kdelibs + libpthreadstubs + libXdmcp + libxcb + pkgconfig + xlibs.xcbutilimage + ]; + + patches = [ ./qtcurve-1.8.17-install-paths.patch ]; + + cmakeFlags = '' + -DENABLE_QT5=OFF + -DQTC_QT4_ENABLE_KWIN=ON + ''; + + meta = { + homepage = https://github.com/QtCurve/qtcurve; + description = "Widget styles for Qt4/KDE4 and gtk2"; + platforms = stdenv.lib.platforms.linux; + license = "LGPLv2.1+"; + }; +} diff --git a/pkgs/misc/themes/qtcurve/qtcurve-1.8.17-install-paths.patch b/pkgs/misc/themes/qtcurve/qtcurve-1.8.17-install-paths.patch new file mode 100644 index 00000000000..bb8fd185c77 --- /dev/null +++ b/pkgs/misc/themes/qtcurve/qtcurve-1.8.17-install-paths.patch @@ -0,0 +1,25 @@ +diff -ur qtcurve-1.8.17-a/CMakeLists.txt qtcurve-1.8.17-b/CMakeLists.txt +--- qtcurve-1.8.17-a/CMakeLists.txt 2013-10-18 07:35:20.000000000 -0500 ++++ qtcurve-1.8.17-b/CMakeLists.txt 2013-12-30 10:58:43.303808246 -0600 +@@ -135,8 +135,9 @@ + if(ENABLE_GTK2) + find_package(PkgConfig REQUIRED) + pkg_check_modules(GTK2 REQUIRED gtk+-2.0) ++ set(GTK2_THEME_PREFIX "${CMAKE_INSTALL_PREFIX}") + if(GTK2_THEME_PREFIX) +- set(GTK2_PREIX "${GTK2_THEME_PREFIX}") ++ set(GTK2_PREFIX "${GTK2_THEME_PREFIX}") + elseif(NOT GTK2_PREFIX) + set(GTK2_PREFIX "${CMAKE_INSTALL_PREFIX}") + endif() +diff -ur qtcurve-1.8.17-a/gtk2/style/CMakeLists.txt qtcurve-1.8.17-b/gtk2/style/CMakeLists.txt +--- qtcurve-1.8.17-a/gtk2/style/CMakeLists.txt 2013-10-18 07:35:20.000000000 -0500 ++++ qtcurve-1.8.17-b/gtk2/style/CMakeLists.txt 2013-12-30 11:23:41.370548328 -0600 +@@ -88,6 +88,6 @@ + m ${QTC_X11_LIBRARIES} qtcurve-utils) + + install(TARGETS qtcurve-gtk2 LIBRARY DESTINATION +- ${GTK2_LIBDIR}/gtk-2.0/${GTK2_BIN_VERSION}/engines) ++ lib/gtk-2.0/${GTK2_BIN_VERSION}/engines) + install(FILES gtkrc icons3 icons4 map_kde_icons.pl kdeglobals + DESTINATION ${GTK2_THEME_DIR}/gtk-2.0) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c1181e70c2b..5c0e546f81d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9765,6 +9765,10 @@ let psi = callPackage ../applications/networking/instant-messengers/psi { }; + qtcurve = callPackage ../misc/themes/qtcurve { + stdenv = overrideGCC stdenv gcc47; + }; + quassel = callPackage ../applications/networking/irc/quassel { }; quasselDaemon = (self.quassel.override {