JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use systemd instead of udev, and don't use consolekit

Browse Source
This commit is contained in:
Eelco Dolstra 2012-11-06 13:01:44 +01:00
parent 43c9c791e0
commit 9322bee988
5 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/desktops/kde-4.7/kde-workspace.nix
View File

@ -1,6 +1,6 @@
{ kde, kdelibs, qimageblitz, libdbusmenu_qt, xorg, shared_desktop_ontologies
, lm_sensors, pciutils, libraw1394, libusb, libxklavier, python, libqalculate
, consolekit, xkeyboard_config, kdepimlibs, pam, boost, gpsd, prison, akonadi
, xkeyboard_config, kdepimlibs, pam, boost, gpsd, prison, akonadi
, pykde4, libjpeg, pkgconfig, libXft, libXxf86misc
}:
@ -12,7 +12,7 @@ kde {
xorg.libXcomposite xorg.libXdamage xorg.libXau xorg.libXdmcp
xorg.libpthreadstubs
boost gpsd shared_desktop_ontologies lm_sensors pciutils libraw1394
libusb python libqalculate consolekit kdepimlibs pam prison akonadi
libusb python libqalculate kdepimlibs pam prison akonadi
];
buildNativeInputs = [ pkgconfig ];

4
pkgs/desktops/kde-4.8/kde-workspace.nix
View File

@ -1,6 +1,6 @@
{ kde, kdelibs, qimageblitz, libdbusmenu_qt, xorg, shared_desktop_ontologies,
lm_sensors, pciutils, libraw1394, libusb, libxklavier, python, libqalculate,
consolekit, xkeyboard_config, kdepimlibs, pam, boost, gpsd, prison, akonadi,
xkeyboard_config, kdepimlibs, pam, boost, gpsd, prison, akonadi,
pykde4, libjpeg, pkgconfig, libXft, libXxf86misc, kactivities
}:
@ -12,7 +12,7 @@ kde {
xorg.libXcomposite xorg.libXdamage xorg.libXau xorg.libXdmcp
xorg.libpthreadstubs
boost gpsd shared_desktop_ontologies lm_sensors pciutils libraw1394
libusb python libqalculate consolekit kdepimlibs pam prison akonadi
libusb python libqalculate kdepimlibs pam prison akonadi
kactivities
];

2
pkgs/development/libraries/polkit/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, glib, expat, pam, intltool, gettext
, gobjectIntrospection
, useSystemd ? false, systemd ? null }:
, useSystemd ? true, systemd }:
let

2
pkgs/os-specific/linux/upower/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, glib, dbus, dbus_glib, dbus_tools, polkit
, intltool, libxslt, docbook_xsl, udev, libusb1, pmutils
, useSystemd ? false, systemd ? null
, useSystemd ? true, systemd
}:
assert stdenv.isLinux;

10
pkgs/top-level/all-packages.nix
View File

@ -5095,12 +5095,11 @@ let
zeromq2 = callPackage ../development/libraries/zeromq/2.x.nix {};
zeromq3 = callPackage ../development/libraries/zeromq/3.x.nix {};
### DEVELOPMENT / LIBRARIES / JAVA
### DEVELOPMENT / LIBRARIES / JAVA
atermjava = callPackage ../development/libraries/java/aterm {
stdenv = overrideInStdenv stdenv [gnumake380];
};
commonsFileUpload = callPackage ../development/libraries/java/jakarta-commons/file-upload { };
@ -5169,6 +5168,7 @@ let
jquery_ui = callPackage ../development/libraries/javascript/jquery-ui { };
### DEVELOPMENT / PERL MODULES
buildPerlPackage = import ../development/perl-modules/generic perl;
@ -6241,7 +6241,7 @@ let
udev145 = callPackage ../os-specific/linux/udev/145.nix { };
udev173 = callPackage ../os-specific/linux/udev/173.nix { };
udev = pkgs.udev173;
udev = pkgs.systemd;
udisks = callPackage ../os-specific/linux/udisks { };
@ -7667,7 +7667,9 @@ let
dropbox = callPackage ../applications/networking/dropbox { };
slim = callPackage ../applications/display-managers/slim { };
slim = callPackage ../applications/display-managers/slim {
consolekit = null;
};
sndBase = builderDefsPackage (import ../applications/audio/snd) {
inherit fetchurl stdenv stringsWithDeps lib fftw;