diff options
| -rw-r--r-- | pkgs/development/libraries/libusb1/1_0_9.nix | 20 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/upower/default.nix | 20 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
3 files changed, 12 insertions, 32 deletions
diff --git a/pkgs/development/libraries/libusb1/1_0_9.nix b/pkgs/development/libraries/libusb1/1_0_9.nix deleted file mode 100644 index a2d628f96896..000000000000 --- a/pkgs/development/libraries/libusb1/1_0_9.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, fetchurl, pkgconfig }: - -stdenv.mkDerivation rec { - name = "libusb-1.0.9"; - - src = fetchurl { - url = "mirror://sourceforge/libusb/${name}.tar.bz2"; - sha256 = "16sz34ix6hw2wwl3kqx6rf26fg210iryr68wc439dc065pffw879"; - }; - - buildInputs = [ pkgconfig ]; - - meta = { - homepage = http://www.libusb.org; - description = "User-space USB library"; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.urkud ]; - }; -} - diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix index 197a8403d323..cba4a510ff06 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"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 234362c13bd9..d96f0f594a6c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7064,9 +7064,7 @@ let untie = callPackage ../os-specific/linux/untie { }; - upower = callPackage ../os-specific/linux/upower { - libusb1 = callPackage ../development/libraries/libusb1/1_0_9.nix {}; - }; + upower = callPackage ../os-specific/linux/upower { }; upstart = callPackage ../os-specific/linux/upstart { }; |