mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-25 07:00:43 +00:00
Added PAM support for KDE login manager
svn path=/nixpkgs/trunk/; revision=14824
This commit is contained in:
parent
a2803bc5c3
commit
829f95f836
|
@ -1,4 +1,4 @@
|
|||
{stdenv, fetchurl, cmake, perl, python,
|
||||
{stdenv, fetchurl, cmake, perl, python, pam, ConsoleKit,
|
||||
qt4, sip, pyqt4, kdelibs, kdepimlibs, kdebindings,
|
||||
libXi, libXau, libXdmcp, libXtst, libXcomposite, libXdamage, libXScrnSaver,
|
||||
lm_sensors, libxklavier, libusb, pthread_stubs, boost,
|
||||
|
@ -11,7 +11,7 @@ stdenv.mkDerivation {
|
|||
sha1 = "412b8a6778d5c71a366c054b0136edae309bbef0";
|
||||
};
|
||||
CMAKE_PREFIX_PATH=kdepimlibs;
|
||||
buildInputs = [ cmake perl python qt4 /*sip pyqt4*/ kdelibs kdepimlibs /*kdebindings*/ pthread_stubs boost libusb stdenv.gcc.libc
|
||||
buildInputs = [ cmake perl python qt4 pam ConsoleKit /*sip pyqt4*/ kdelibs kdepimlibs /*kdebindings*/ pthread_stubs boost libusb stdenv.gcc.libc
|
||||
libXi libXau libXdmcp libXtst libXcomposite libXdamage libXScrnSaver
|
||||
lm_sensors libxklavier automoc4 phonon strigi soprano qimageblitz ];
|
||||
}
|
||||
|
|
|
@ -54,8 +54,8 @@ rec {
|
|||
|
||||
### BASE
|
||||
kdebase_workspace = import ./base-workspace {
|
||||
inherit (pkgs) stdenv fetchurl cmake qt4 perl python sip pyqt4;
|
||||
inherit (pkgs) lm_sensors libxklavier libusb pthread_stubs boost;
|
||||
inherit (pkgs) stdenv fetchurl cmake qt4 perl python pam sip pyqt4;
|
||||
inherit (pkgs) lm_sensors libxklavier libusb pthread_stubs boost ConsoleKit;
|
||||
inherit (pkgs.xlibs) libXi libXau libXdmcp libXtst libXcomposite libXdamage libXScrnSaver;
|
||||
inherit kdelibs kdepimlibs kdebindings;
|
||||
inherit automoc4 phonon strigi soprano qimageblitz;
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{stdenv, fetchurl, pkgconfig, dbus_glib, zlib, glib, libX11}:
|
||||
{stdenv, fetchurl, pkgconfig, dbus_glib, zlib, pam, glib, libX11}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "ConsoleKit-0.3.0";
|
||||
|
@ -6,5 +6,5 @@ stdenv.mkDerivation {
|
|||
url = http://people.freedesktop.org/~mccann/dist/ConsoleKit-0.3.0.tar.bz2;
|
||||
md5 = "43b02a52212330b54cfb34c4044d9ce0";
|
||||
};
|
||||
buildInputs = [ pkgconfig dbus_glib zlib glib libX11 ];
|
||||
buildInputs = [ pkgconfig dbus_glib zlib pam glib libX11 ];
|
||||
}
|
||||
|
|
|
@ -2803,7 +2803,7 @@ let
|
|||
};
|
||||
|
||||
ConsoleKit = import ../development/libraries/ConsoleKit {
|
||||
inherit stdenv fetchurl pkgconfig dbus_glib zlib;
|
||||
inherit stdenv fetchurl pkgconfig dbus_glib zlib pam;
|
||||
inherit (gtkLibs) glib;
|
||||
inherit (xlibs) libX11;
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue