mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-22 14:45:27 +00:00
Code Issues Wiki Activity

Revert "Really add policykit support to kdebase-workspace"

Browse source 
svn path=/nixpkgs/trunk/; revision=21609
This commit is contained in:
Yury G. Kudryashov 2010-05-05 18:17:45 +00:00
parent d61f35545c
commit 320ce20929
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/desktops/kde-4.4/base-workspace/default.nix
View file

@ -2,7 +2,7 @@
, qt4, sip, pyqt4, kdelibs, kdepimlibs, kdebindings
, libXi, libXau, libXdmcp, libXtst, libXcomposite, libXdamage, libXScrnSaver
, lm_sensors, libxklavier, libusb, libpthreadstubs, boost
, automoc4, phonon, strigi, soprano, qimageblitz, akonadi, polkit_qt, policykit
, automoc4, phonon, strigi, soprano, qimageblitz, akonadi, polkit_qt
}:
stdenv.mkDerivation {
@ -14,8 +14,7 @@ stdenv.mkDerivation {
buildInputs = [ cmake perl python qt4 pam consolekit sip pyqt4 kdelibs libXtst
kdepimlibs kdebindings boost libusb stdenv.gcc.libc libXi libXau libXdmcp
libXcomposite libXdamage libXScrnSaver lm_sensors libxklavier automoc4
phonon strigi soprano qimageblitz akonadi polkit_qt libpthreadstubs
policykit ];
phonon strigi soprano qimageblitz akonadi polkit_qt libpthreadstubs ];
patchPhase=''
sed -i -e 's|''${PYTHON_SITE_PACKAGES_DIR}|''${CMAKE_INSTALL_PREFIX}/lib/python2.6/site-packages|' \
plasma/generic/scriptengines/python/CMakeLists.txt

2
pkgs/desktops/kde-4.4/default.nix
View file

@ -69,7 +69,7 @@ pkgs.recurseIntoAttrs (rec {
### BASE
kdebase_workspace = import ./base-workspace {
inherit (pkgs) stdenv fetchurl lib cmake qt4 perl python pam sip pyqt4;
inherit (pkgs) lm_sensors libxklavier libusb boost consolekit policykit;
inherit (pkgs) lm_sensors libxklavier libusb boost consolekit;
inherit (pkgs.xlibs) libXi libXau libXdmcp libXtst libXcomposite libXdamage libXScrnSaver libpthreadstubs;
inherit kdelibs kdepimlibs kdebindings;
inherit automoc4 phonon strigi soprano qimageblitz akonadi polkit_qt;