upower: fix Xfce via --enable-deprecated

Also drop older libusb1 version which is no longer needed with newer upower.
This commit is contained in:
Vladimír Čunát
2013-11-12 09:59:58 +01:00
parent 85d21a6963
commit 91028bd151
3 changed files with 12 additions and 32 deletions

View File

@@ -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";