diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-11-12 09:59:58 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-11-12 10:05:57 +0100 |
| commit | 91028bd151a1fdd7773fd0bca48a314c36b40e26 (patch) | |
| tree | 3c935c4752177d40867ea27d6a59e50374f3cf32 /pkgs/os-specific/linux/upower/default.nix | |
| parent | 85d21a696347dcef08b60ee87c60455a43560b66 (diff) | |
| download | nixpkgs-91028bd151a1fdd7773fd0bca48a314c36b40e26.tar nixpkgs-91028bd151a1fdd7773fd0bca48a314c36b40e26.tar.gz nixpkgs-91028bd151a1fdd7773fd0bca48a314c36b40e26.tar.bz2 nixpkgs-91028bd151a1fdd7773fd0bca48a314c36b40e26.tar.lz nixpkgs-91028bd151a1fdd7773fd0bca48a314c36b40e26.tar.xz nixpkgs-91028bd151a1fdd7773fd0bca48a314c36b40e26.tar.zst nixpkgs-91028bd151a1fdd7773fd0bca48a314c36b40e26.zip | |
upower: fix Xfce via --enable-deprecated
Also drop older libusb1 version which is no longer needed with newer upower.
Diffstat (limited to 'pkgs/os-specific/linux/upower/default.nix')
| -rw-r--r-- | pkgs/os-specific/linux/upower/default.nix | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix index 197a8403d32..cba4a510ff0 100644 --- a/pkgs/os-specific/linux/upower/default.nix +++ b/pkgs/os-specific/linux/upower/default.nix @@ -19,15 +19,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; - configureFlags = - [ "--with-backend=linux" "--localstatedir=/var" ] - ++ stdenv.lib.optional useSystemd - [ "--enable-systemd" - "--with-systemdsystemunitdir=$(out)/etc/systemd/system" - "--with-systemdutildir=$(out)/lib/systemd/system-sleep" - "--with-udevrulesdir=$(out)/lib/udev/rules.d" - ]; - preConfigure = '' substituteInPlace src/linux/up-backend.c \ @@ -37,6 +28,17 @@ stdenv.mkDerivation rec { --replace /usr/bin/dbus-send ${dbus_tools}/bin/dbus-send ''; + configureFlags = + [ "--with-backend=linux" "--localstatedir=/var" + "--enable-deprecated" # needed for Xfce (Nov 2013) + ] + ++ stdenv.lib.optional useSystemd + [ "--enable-systemd" + "--with-systemdsystemunitdir=$(out)/etc/systemd/system" + "--with-systemdutildir=$(out)/lib/systemd/system-sleep" + "--with-udevrulesdir=$(out)/lib/udev/rules.d" + ]; + NIX_CFLAGS_LINK = "-lgcc_s"; installFlags = "historydir=$(TMPDIR)/foo"; |