diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2019-09-08 08:14:35 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-08 08:14:35 -0400 |
| commit | 362c2f67f9e24771f6634cec90111ab7992b5cfa (patch) | |
| tree | 4b30b58345caccf95b543bfc34860584f32ebde7 /pkgs/os-specific/linux/upower/default.nix | |
| parent | 7e534e3eeb4ac4d786584467932efeb0c4d5669c (diff) | |
| parent | 16083defb5aff18f70e938c6ecad1c9b11c3054a (diff) | |
| download | nixpkgs-362c2f67f9e24771f6634cec90111ab7992b5cfa.tar nixpkgs-362c2f67f9e24771f6634cec90111ab7992b5cfa.tar.gz nixpkgs-362c2f67f9e24771f6634cec90111ab7992b5cfa.tar.bz2 nixpkgs-362c2f67f9e24771f6634cec90111ab7992b5cfa.tar.lz nixpkgs-362c2f67f9e24771f6634cec90111ab7992b5cfa.tar.xz nixpkgs-362c2f67f9e24771f6634cec90111ab7992b5cfa.tar.zst nixpkgs-362c2f67f9e24771f6634cec90111ab7992b5cfa.zip | |
Merge pull request #68037 from dtzWill/update/upower-0.99.11
upower: 0.99.10 -> 0.99.11
Diffstat (limited to 'pkgs/os-specific/linux/upower/default.nix')
| -rw-r--r-- | pkgs/os-specific/linux/upower/default.nix | 41 |
1 files changed, 23 insertions, 18 deletions
diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix index 59e39f72f51..d787acae61b 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 { pname = "upower"; - version = "0.99.10"; + version = "0.99.11"; + + outputs = [ "out" "dev" ]; src = fetchurl { - url = https://gitlab.freedesktop.org/upower/upower/uploads/c438511024b9bc5a904f8775cfc8e4c4/upower-0.99.10.tar.xz; - sha256 = "17d2bclv5fgma2y3g8bsn9pdvspn1zrzismzdnzfivc0f2wm28k4"; + 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" |