packagekit: 1.1.12 -> 1.1.13 (#77498)

* packagekit: 1.1.12 -> 1.1.13

https://github.com/hughsie/PackageKit/blob/PACKAGEKIT_1_1_13/NEWS

* packagekit: set systemd user unit dir, minor touchups

While visiting:
* drop trailing slash in system unit dir
* prefer placeholder over escaping

* packagekit: dbus dir fixup (thanks @worldofpeace!)

Co-Authored-By: worldofpeace <worldofpeace@protonmail.ch>
This commit is contained in:
Will Dietz 2020-01-18 07:34:18 -06:00 committed by worldofpeace
parent 37771e47eb
commit b873eb7317

View File

@ -9,7 +9,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "packagekit"; pname = "packagekit";
version = "1.1.12"; version = "1.1.13";
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
owner = "hughsie"; owner = "hughsie";
repo = "PackageKit"; repo = "PackageKit";
rev = "PACKAGEKIT_${lib.replaceStrings ["."] ["_"] version}"; rev = "PACKAGEKIT_${lib.replaceStrings ["."] ["_"] version}";
sha256 = "02wq3jw3mkdld90irh5vdfd5bri2g1p89mhrmj56kvif1fqak46x"; sha256 = "0xmgac27p5z8wr56yw3cqhywnlvaf8kvyv1g0nzxnq167xj5vxam";
}; };
buildInputs = [ glib polkit python3 gobject-introspection ] buildInputs = [ glib polkit python3 gobject-introspection ]
@ -40,7 +40,8 @@ stdenv.mkDerivation rec {
"--localstatedir=/var" "--localstatedir=/var"
"--sysconfdir=/etc" "--sysconfdir=/etc"
"--with-dbus-sys=${placeholder "out"}/share/dbus-1/system.d" "--with-dbus-sys=${placeholder "out"}/share/dbus-1/system.d"
"--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system/" "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system"
"--with-systemduserunitdir=${placeholder "out"}/lib/systemd/user"
] ]
++ lib.optional enableNixBackend "--enable-nix" ++ lib.optional enableNixBackend "--enable-nix"
++ lib.optional (!enableBashCompletion) "--disable-bash-completion" ++ lib.optional (!enableBashCompletion) "--disable-bash-completion"
@ -49,7 +50,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
installFlags = [ installFlags = [
"sysconfdir=\${out}/etc" "sysconfdir=${placeholder "out"}/etc"
"localstatedir=\${TMPDIR}" "localstatedir=\${TMPDIR}"
]; ];