Author: urkud
Date: Mon Aug 16 20:37:18 2010
New Revision: 23195
URL: https://svn.nixos.org/websvn/nix/?rev=23195&sc=1
Log:
Rewrite builsystem fixes in upstream-supported manner
Added:
nixpkgs/trunk/pkgs/desktops/kde-4.5/utils/log-feature.diff
Modified:
nixpkgs/trunk/pkgs/desktops/kde-4.5/utils/default.nix
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.5/utils/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/kde-4.5/utils/default.nix Mon Aug 16
17:03:35 2010 (r23194)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.5/utils/default.nix Mon Aug 16
20:37:18 2010 (r23195)
@@ -1,30 +1,28 @@
{ kdePackage, cmake, qt4, perl, gmp, python, libzip, libarchive, xz
, sip, pyqt4, pycups, rhpl, system_config_printer, qjson, shared_mime_info
+, kdebase_workspace
, kdelibs, kdepimlibs, kdebase, kdebindings, automoc4, qimageblitz, qca2}:
kdePackage {
pn = "kdeutils";
v = "4.5.0";
- inherit system_config_printer;
- preConfigure = ''
+ postPatch = ''
+ cp -vn ${qjson}/share/apps/cmake/modules/FindQJSON.cmake cmake/modules
sed -e
"s@/usr\(/share/system-config-printer\)@${system_config_printer}\1@" -i \
printer-applet/cmake-modules/FindSystemConfigPrinter.py \
printer-applet/printer-applet.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
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 = {
description = "KDE Utilities";
license = "GPL";
- homepage = http://www.kde.org;
- inherit (kdelibs.meta) maintainers platforms;
};
}
Added: nixpkgs/trunk/pkgs/desktops/kde-4.5/utils/log-feature.diff
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.5/utils/log-feature.diff Mon Aug 16
20:37:18 2010 (r23195)
@@ -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 )
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
