diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2019-09-08 04:55:14 -0400 |
|---|---|---|
| committer | worldofpeace <worldofpeace@protonmail.ch> | 2019-09-08 07:02:41 -0400 |
| commit | 579a08ab15e066319e615741868dc4175d4890a4 (patch) | |
| tree | b693db1960e2be5454361432ccafb3e3990002f4 /pkgs/os-specific/linux/upower/default.nix | |
| parent | 11b43cef8e7dac98e96502177caae37c9ed1c0fb (diff) | |
| download | nixpkgs-579a08ab15e066319e615741868dc4175d4890a4.tar nixpkgs-579a08ab15e066319e615741868dc4175d4890a4.tar.gz nixpkgs-579a08ab15e066319e615741868dc4175d4890a4.tar.bz2 nixpkgs-579a08ab15e066319e615741868dc4175d4890a4.tar.lz nixpkgs-579a08ab15e066319e615741868dc4175d4890a4.tar.xz nixpkgs-579a08ab15e066319e615741868dc4175d4890a4.tar.zst nixpkgs-579a08ab15e066319e615741868dc4175d4890a4.zip | |
upower: cleanup
* correct inputs * drop dbus-glib Has not been needed for a very long time. * intltool -> gettext * add optional libimobiledevice * propagate glib It's in Requires * dev output * drop useSystemd
Diffstat (limited to 'pkgs/os-specific/linux/upower/default.nix')
| -rw-r--r-- | pkgs/os-specific/linux/upower/default.nix | 35 |
1 files changed, 20 insertions, 15 deletions
diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix index e931b28efbe..91dddb50c34 100644 --- a/pkgs/os-specific/linux/upower/default.nix +++ b/pkgs/os-specific/linux/upower/default.nix @@ -1,53 +1,58 @@ { stdenv , fetchurl , pkgconfig -, dbus-glib -, intltool , libxslt , docbook_xsl , udev , libgudev , libusb1 +, glib , gobject-introspection -, useSystemd ? true, systemd +, gettext +, systemd +, useIMobileDevice ? true +, libimobiledevice }: stdenv.mkDerivation rec { pname = "upower"; version = "0.99.11"; + outputs = [ "out" "dev" ]; + src = fetchurl { url = https://gitlab.freedesktop.org/upower/upower/uploads/93cfe7c8d66ed486001c4f3f55399b7a/upower-0.99.11.tar.xz; sha256 = "1vxxvmz2cxb1qy6ibszaz5bskqdy9nd9fxspj9fv3gfmrjzzzdb4"; }; nativeBuildInputs = [ + docbook_xsl + gettext + gobject-introspection + libxslt pkgconfig ]; buildInputs = [ - dbus-glib - intltool - libxslt - docbook_xsl - udev libgudev libusb1 - gobject-introspection + udev + systemd ] - ++ stdenv.lib.optional useSystemd systemd + ++ stdenv.lib.optional useIMobileDevice libimobiledevice ; + propagatedBuildInputs = [ + glib + ]; + configureFlags = [ - "--with-backend=linux" "--localstatedir=/var" - ] - ++ stdenv.lib.optional useSystemd [ + "--with-backend=linux" "--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system" "--with-systemdutildir=${placeholder "out"}/lib/systemd" "--with-udevrulesdir=${placeholder "out"}/lib/udev/rules.d" - ] - ; + ]; doCheck = false; # fails with "env: './linux/integration-test': No such file or directory" |