upower: fix Xfce via --enable-deprecated
Also drop older libusb1 version which is no longer needed with newer upower.
This commit is contained in:
@@ -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";
|
||||
|
||||
Reference in New Issue
Block a user