Author: eelco
Date: Tue Jul 12 13:24:35 2011
New Revision: 27737
URL: https://svn.nixos.org/websvn/nix/?rev=27737&sc=1
Log:
* Add kde-workspace.
* Make sure that polkit actions get installed in $out.
Added:
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/workspace.nix
nixpkgs/branches/kde-4.7/pkgs/development/libraries/polkit-qt-1/polkit-install.patch
Modified:
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/default.nix
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/libs/default.nix
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/libs/polkit-install.patch
nixpkgs/branches/kde-4.7/pkgs/development/libraries/polkit-qt-1/default.nix
Modified: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/default.nix
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/default.nix Tue Jul 12
13:14:23 2011 (r27736)
+++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/default.nix Tue Jul 12
13:24:35 2011 (r27737)
@@ -55,6 +55,8 @@
kde_baseapps = callPackage ./baseapps.nix { };
+ kde_workspace = callPackage ./workspace.nix { };
+
### OTHER MODULES
gwenview = callPackage ./gwenview.nix { };
Modified: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/libs/default.nix
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/libs/default.nix Tue Jul
12 13:14:23 2011 (r27736)
+++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/libs/default.nix Tue Jul
12 13:24:35 2011 (r27737)
@@ -23,7 +23,7 @@
#propagatedBuildInputs = [ qt4 gcc.libc strigi soprano attica qca2
# shared_desktop_ontologies ];
- #patches = [ ./polkit-install.patch ];
+ patches = [ ./polkit-install.patch ];
# cmake fails to find acl.h because of C++-style comment
# TODO: OpenEXR
Modified:
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/libs/polkit-install.patch
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/libs/polkit-install.patch
Tue Jul 12 13:14:23 2011 (r27736)
+++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/libs/polkit-install.patch
Tue Jul 12 13:24:35 2011 (r27737)
@@ -1,12 +1,12 @@
-Author: Yury Kudryashov
-Reason: other KDE modules try to install polkit action files into
-$kdelibs/share/polkit-1/actions
-Upstream: rejected, they propose to set install dir in each package
---- a/cmake/modules/FindPolkitQt-1.cmake.old 2010-08-12 16:13:45.000000000
+0400
-+++ b/cmake/modules/FindPolkitQt-1.cmake 2010-08-12 16:13:56.000000000
+0400
-@@ -101,4 +101,4 @@
- endif (NOT PC_POLKITQT-1_PREFIX STREQUAL CMAKE_INSTALL_PREFIX)
- endif (POLKITQT-1_FOUND)
+diff -ru -x '*~' kdelibs-4.6.90-orig/kdecore/auth/ConfigureChecks.cmake
kdelibs-4.6.90/kdecore/auth/ConfigureChecks.cmake
+--- kdelibs-4.6.90-orig/kdecore/auth/ConfigureChecks.cmake 2011-05-20
22:24:54.000000000 +0200
++++ kdelibs-4.6.90/kdecore/auth/ConfigureChecks.cmake 2011-07-12
14:03:00.000000000 +0200
+@@ -139,7 +139,7 @@
+ ${CMAKE_INSTALL_PREFIX} _KDE4_AUTH_POLICY_FILES_INSTALL_DIR
+ ${POLKITQT-1_POLICY_FILES_INSTALL_DIR})
--set(POLKITQT-1_POLICY_FILES_INSTALL_DIR
${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions)
-+set(POLKITQT-1_POLICY_FILES_INSTALL_DIR share/polkit-1/actions)
+- set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR
${_KDE4_AUTH_POLICY_FILES_INSTALL_DIR} CACHE STRING
++ set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR
"\${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions" CACHE STRING
+ "Where policy files generated by KAuth will be installed" FORCE)
+ elseif(KDE4_AUTH_BACKEND_NAME STREQUAL "FAKE")
+ set (KAUTH_COMPILING_FAKE_BACKEND TRUE)
Added: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/workspace.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/workspace.nix Tue Jul
12 13:24:35 2011 (r27737)
@@ -0,0 +1,24 @@
+{ automoc4, cmake, kde, kdelibs, qt4, strigi, qimageblitz, libdbusmenu_qt
+, xorg, soprano, shared_desktop_ontologies, lm_sensors, pciutils, libraw1394
+, libusb, libxklavier, perl, python
+}:
+
+kde.package {
+
+ buildInputs =
+ [ cmake kdelibs qt4 automoc4 strigi qimageblitz libdbusmenu_qt
+ xorg.libxkbfile xorg.libXcomposite xorg.libXScrnSaver xorg.libXtst
+ xorg.libXcomposite xorg.libXdamage xorg.libXau
+ soprano shared_desktop_ontologies lm_sensors pciutils libraw1394
+ libusb python
+ ];
+
+ # Workaround for ‘undefined reference to `dlsym'’ in kwinglutils_funcs.cpp.
+ NIX_LDFLAGS = "-ldl";
+
+ meta = {
+ description = "KDE desktop environment workspace components";
+ license = "GPLv2";
+ kde.name = "kde-workspace";
+ };
+}
Modified:
nixpkgs/branches/kde-4.7/pkgs/development/libraries/polkit-qt-1/default.nix
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/development/libraries/polkit-qt-1/default.nix
Tue Jul 12 13:14:23 2011 (r27736)
+++ nixpkgs/branches/kde-4.7/pkgs/development/libraries/polkit-qt-1/default.nix
Tue Jul 12 13:24:35 2011 (r27737)
@@ -8,6 +8,8 @@
sha256 = "02m710q34aapbmnz1p6qwgkk5xjmm239zdl3lvjg77dh3j0w5i3r";
};
+ patches = [ ./polkit-install.patch ];
+
buildInputs = [ cmake qt4 automoc4 ];
propagatedBuildInputs = [ polkit glib ];
Added:
nixpkgs/branches/kde-4.7/pkgs/development/libraries/polkit-qt-1/polkit-install.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/branches/kde-4.7/pkgs/development/libraries/polkit-qt-1/polkit-install.patch
Tue Jul 12 13:24:35 2011 (r27737)
@@ -0,0 +1,12 @@
+diff -ru -x '*~' polkit-qt-1-0.99.0-orig/PolkitQt-1Config.cmake.in
polkit-qt-1-0.99.0/PolkitQt-1Config.cmake.in
+--- polkit-qt-1-0.99.0-orig/PolkitQt-1Config.cmake.in 2010-12-08
18:22:28.000000000 +0100
++++ polkit-qt-1-0.99.0/PolkitQt-1Config.cmake.in 2011-07-12
13:26:51.000000000 +0200
+@@ -15,7 +15,7 @@
+
+ set(POLKITQT-1_INCLUDE_DIR "@INCLUDE_INSTALL_DIR@/polkit-qt-1")
+ set(POLKITQT-1_LIB_DIR "@LIB_INSTALL_DIR@")
+-set(POLKITQT-1_POLICY_FILES_INSTALL_DIR
"${POLKITQT-1_INSTALL_DIR}/share/polkit-1/actions")
++set(POLKITQT-1_POLICY_FILES_INSTALL_DIR
"${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions")
+
+ # Compatibility
+ if(WIN32)
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
