Revert "Really add policykit support to kdebase-workspace"
svn path=/nixpkgs/trunk/; revision=21609
This commit is contained in:
parent
d61f35545c
commit
320ce20929
|
@ -2,7 +2,7 @@
|
||||||
, qt4, sip, pyqt4, kdelibs, kdepimlibs, kdebindings
|
, qt4, sip, pyqt4, kdelibs, kdepimlibs, kdebindings
|
||||||
, libXi, libXau, libXdmcp, libXtst, libXcomposite, libXdamage, libXScrnSaver
|
, libXi, libXau, libXdmcp, libXtst, libXcomposite, libXdamage, libXScrnSaver
|
||||||
, lm_sensors, libxklavier, libusb, libpthreadstubs, boost
|
, 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 {
|
stdenv.mkDerivation {
|
||||||
|
@ -14,8 +14,7 @@ stdenv.mkDerivation {
|
||||||
buildInputs = [ cmake perl python qt4 pam consolekit sip pyqt4 kdelibs libXtst
|
buildInputs = [ cmake perl python qt4 pam consolekit sip pyqt4 kdelibs libXtst
|
||||||
kdepimlibs kdebindings boost libusb stdenv.gcc.libc libXi libXau libXdmcp
|
kdepimlibs kdebindings boost libusb stdenv.gcc.libc libXi libXau libXdmcp
|
||||||
libXcomposite libXdamage libXScrnSaver lm_sensors libxklavier automoc4
|
libXcomposite libXdamage libXScrnSaver lm_sensors libxklavier automoc4
|
||||||
phonon strigi soprano qimageblitz akonadi polkit_qt libpthreadstubs
|
phonon strigi soprano qimageblitz akonadi polkit_qt libpthreadstubs ];
|
||||||
policykit ];
|
|
||||||
patchPhase=''
|
patchPhase=''
|
||||||
sed -i -e 's|''${PYTHON_SITE_PACKAGES_DIR}|''${CMAKE_INSTALL_PREFIX}/lib/python2.6/site-packages|' \
|
sed -i -e 's|''${PYTHON_SITE_PACKAGES_DIR}|''${CMAKE_INSTALL_PREFIX}/lib/python2.6/site-packages|' \
|
||||||
plasma/generic/scriptengines/python/CMakeLists.txt
|
plasma/generic/scriptengines/python/CMakeLists.txt
|
||||||
|
|
|
@ -69,7 +69,7 @@ pkgs.recurseIntoAttrs (rec {
|
||||||
### BASE
|
### BASE
|
||||||
kdebase_workspace = import ./base-workspace {
|
kdebase_workspace = import ./base-workspace {
|
||||||
inherit (pkgs) stdenv fetchurl lib cmake qt4 perl python pam sip pyqt4;
|
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 (pkgs.xlibs) libXi libXau libXdmcp libXtst libXcomposite libXdamage libXScrnSaver libpthreadstubs;
|
||||||
inherit kdelibs kdepimlibs kdebindings;
|
inherit kdelibs kdepimlibs kdebindings;
|
||||||
inherit automoc4 phonon strigi soprano qimageblitz akonadi polkit_qt;
|
inherit automoc4 phonon strigi soprano qimageblitz akonadi polkit_qt;
|
||||||
|
|
Loading…
Reference in a new issue