public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rewrite builsystem fixes in upstream-supported manner

Browse Source 
svn path=/nixpkgs/trunk/; revision=23195
This commit is contained in:
Yury G. Kudryashov 2010-08-16 20:37:18 +00:00
parent 9670fca780
commit 501117b1c5
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/desktops/kde-4.5/utils/default.nix
View File

@ -1,30 +1,28 @@
{ kdePackage, cmake, qt4, perl, gmp, python, libzip, libarchive, xz { kdePackage, cmake, qt4, perl, gmp, python, libzip, libarchive, xz
, sip, pyqt4, pycups, rhpl, system_config_printer, qjson, shared_mime_info , sip, pyqt4, pycups, rhpl, system_config_printer, qjson, shared_mime_info
, kdebase_workspace
, kdelibs, kdepimlibs, kdebase, kdebindings, automoc4, qimageblitz, qca2}: , kdelibs, kdepimlibs, kdebase, kdebindings, automoc4, qimageblitz, qca2}:
kdePackage { kdePackage {
pn = "kdeutils"; pn = "kdeutils";
v = "4.5.0"; v = "4.5.0";
inherit system_config_printer; postPatch = ''
preConfigure = '' cp -vn ${qjson}/share/apps/cmake/modules/FindQJSON.cmake cmake/modules
sed -e "s@/usr\(/share/system-config-printer\)@${system_config_printer}\1@" -i \ sed -e "s@/usr\(/share/system-config-printer\)@${system_config_printer}\1@" -i \
printer-applet/cmake-modules/FindSystemConfigPrinter.py \ printer-applet/cmake-modules/FindSystemConfigPrinter.py \
printer-applet/printer-applet.py printer-applet/printer-applet.py
sed -i -e "s|import cupshelpers.ppds, cupshelpers.cupshelpers|import ppds, cupshelpers|" printer-applet/cmake-modules/FindSystemConfigPrinter.py sed -i -e "s|import cupshelpers.ppds, cupshelpers.cupshelpers|import ppds, cupshelpers|" printer-applet/cmake-modules/FindSystemConfigPrinter.py
''; '';
cmakeFlags = "-DCMAKE_MODULE_PATH=${qjson}/share/apps/cmake/modules";
patches = [ ./cmake-module-path.diff ];
buildInputs = [ cmake qt4 perl gmp python libzip libarchive xz sip pyqt4 buildInputs = [ cmake qt4 perl gmp python libzip libarchive xz sip pyqt4
pycups rhpl system_config_printer kdelibs kdepimlibs kdebase kdebindings pycups rhpl system_config_printer kdelibs kdepimlibs kdebase kdebindings
automoc4 qimageblitz qca2 qjson shared_mime_info ]; automoc4 qimageblitz qca2 qjson shared_mime_info kdebase_workspace ];
patches = [ ./log-feature.diff ];
meta = { meta = {
description = "KDE Utilities"; description = "KDE Utilities";
license = "GPL"; license = "GPL";
homepage = http://www.kde.org;
inherit (kdelibs.meta) maintainers platforms;
}; };
} }

10
pkgs/desktops/kde-4.5/utils/log-feature.diff Normal file
View File

@ -0,0 +1,10 @@
--- kdeutils-4.5.0.orig/CMakeLists.txt.orig 2010-08-16 18:21:33.000000000 +0400
+++ kdeutils-4.5.0/CMakeLists.txt 2010-08-16 18:27:05.000000000 +0400
@@ -36,6 +36,7 @@
endif( GMP_FOUND )
if( UNIX )
find_package( KDE4Workspace )
+ macro_log_feature( KDE4Workspace_FOUND "KDE4Workspace" "KDE workscpace library, part of kdebase-workspace" "http://www.kde.org" FALSE "" "Required to build kremotecontrol." )
if( KDE4Workspace_FOUND AND QT_QTXMLPATTERNS_FOUND )
macro_optional_add_subdirectory( kremotecontrol )
endif( KDE4Workspace_FOUND AND QT_QTXMLPATTERNS_FOUND )