Merge pull request #35325 from peterhoeg/u/dbusb

dbus-broker: 9 -> 11

authored by Peter Hoeg and committed by GitHub 1c67ee4f 1fa60974

+8 -5
+7 -4
pkgs/os-specific/linux/dbus-broker/default.nix
··· 1 1 { stdenv, fetchgit, fetchFromGitHub, docutils, meson, ninja, pkgconfig 2 - , dbus, glib, systemd }: 2 + , dbus, glib, linuxHeaders, systemd }: 3 3 4 4 stdenv.mkDerivation rec { 5 5 name = "dbus-broker-${version}"; 6 - version = "9"; 6 + version = "11"; 7 7 8 8 src = fetchFromGitHub { 9 9 owner = "bus1"; 10 10 repo = "dbus-broker"; 11 11 rev = "v${version}"; 12 - sha256 = "0q0kbinkkia96bsy7jczlyjz8xgdrfkyx8v6gdr2zflgv0mgbsab"; 12 + sha256 = "19sszb6ac7md494i996ixqmz9b3gim8rrv2nbrmlgjd59gk6hf7b"; 13 13 fetchSubmodules = true; 14 14 }; 15 15 16 16 nativeBuildInputs = [ docutils meson ninja pkgconfig ]; 17 17 18 - buildInputs = [ dbus glib systemd ]; 18 + buildInputs = [ dbus glib linuxHeaders systemd ]; 19 19 20 20 enableParallelBuilding = true; 21 21 ··· 27 27 28 28 postInstall = '' 29 29 install -Dm644 ../README $out/share/doc/dbus-broker/README 30 + 31 + sed -i $out/lib/systemd/{system,user}/dbus-broker.service \ 32 + -e 's,^ExecReload.*busctl,ExecReload=${systemd}/bin/busctl,' 30 33 ''; 31 34 32 35 checkPhase = "ninja test";
+1 -1
pkgs/top-level/all-packages.nix
··· 1056 1056 1057 1057 devmem2 = callPackage ../os-specific/linux/devmem2 { }; 1058 1058 1059 - dbus-broker = callPackage ../os-specific/linux/dbus-broker {}; 1059 + dbus-broker = callPackage ../os-specific/linux/dbus-broker { }; 1060 1060 1061 1061 ioport = callPackage ../os-specific/linux/ioport {}; 1062 1062