Merge pull request #1444 from ttuegel/qtcurve

add qtcurve-1.8.17
This commit is contained in:
Domen Kožar 2014-01-02 12:31:54 -08:00
commit d76654a55c
3 changed files with 66 additions and 0 deletions

View File

@ -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+";
};
}

View File

@ -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)

View File

@ -9777,6 +9777,10 @@ let
psi = callPackage ../applications/networking/instant-messengers/psi { }; psi = callPackage ../applications/networking/instant-messengers/psi { };
qtcurve = callPackage ../misc/themes/qtcurve {
stdenv = overrideGCC stdenv gcc47;
};
quassel = callPackage ../applications/networking/irc/quassel { }; quassel = callPackage ../applications/networking/irc/quassel { };
quasselDaemon = (self.quassel.override { quasselDaemon = (self.quassel.override {