diff options
| author | Peter Simons <simons@cryp.to> | 2013-12-04 18:33:45 +0100 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2013-12-04 18:33:52 +0100 |
| commit | c32bf83301bc4063df924ee442d8e35c1b96d912 (patch) | |
| tree | 5a0821f9960cfa2508fc6b451fbaf8bfa6326367 /pkgs/os-specific/linux/upower/default.nix | |
| parent | 88c7b4c7fee42c1ae5167fd1e7806d600e4451e4 (diff) | |
| parent | 41f0e6ad9203a1859996e53323321a758c1fc7c4 (diff) | |
| download | nixlib-c32bf83301bc4063df924ee442d8e35c1b96d912.tar nixlib-c32bf83301bc4063df924ee442d8e35c1b96d912.tar.gz nixlib-c32bf83301bc4063df924ee442d8e35c1b96d912.tar.bz2 nixlib-c32bf83301bc4063df924ee442d8e35c1b96d912.tar.lz nixlib-c32bf83301bc4063df924ee442d8e35c1b96d912.tar.xz nixlib-c32bf83301bc4063df924ee442d8e35c1b96d912.tar.zst nixlib-c32bf83301bc4063df924ee442d8e35c1b96d912.zip | |
Merge remote-tracking branch 'origin/master' into stdenv-updates.
Conflicts: pkgs/development/interpreters/perl/5.16/default.nix pkgs/tools/networking/curl/default.nix pkgs/top-level/all-packages.nix pkgs/top-level/release-python.nix pkgs/top-level/release-small.nix pkgs/top-level/release.nix
Diffstat (limited to 'pkgs/os-specific/linux/upower/default.nix')
| -rw-r--r-- | pkgs/os-specific/linux/upower/default.nix | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix index d5dc292ac339..cba4a510ff06 100644 --- a/pkgs/os-specific/linux/upower/default.nix +++ b/pkgs/os-specific/linux/upower/default.nix @@ -6,11 +6,11 @@ assert stdenv.isLinux; stdenv.mkDerivation rec { - name = "upower-0.9.19"; + name = "upower-0.9.23"; src = fetchurl { url = "http://upower.freedesktop.org/releases/${name}.tar.xz"; - sha256 = "053yahks5c7nwdxwx8q6nqp3mxbqldmc844mzyvc3ws9635zmisl"; + sha256 = "06wqhab2mn0j4biiwh7mn4kxbxnfnzjkxvhpgvnlpaz9m2q54cj3"; }; buildInputs = @@ -19,14 +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" - ]; - preConfigure = '' substituteInPlace src/linux/up-backend.c \ @@ -36,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"; |