diff --git a/pkgs/os-specific/linux/dbus-broker/default.nix b/pkgs/os-specific/linux/dbus-broker/default.nix index 51d0fb5e125..c97f1b54622 100644 --- a/pkgs/os-specific/linux/dbus-broker/default.nix +++ b/pkgs/os-specific/linux/dbus-broker/default.nix @@ -1,21 +1,21 @@ { stdenv, fetchgit, fetchFromGitHub, docutils, meson, ninja, pkgconfig -, dbus, glib, systemd }: +, dbus, glib, linuxHeaders, systemd }: stdenv.mkDerivation rec { name = "dbus-broker-${version}"; - version = "9"; + version = "11"; src = fetchFromGitHub { owner = "bus1"; repo = "dbus-broker"; rev = "v${version}"; - sha256 = "0q0kbinkkia96bsy7jczlyjz8xgdrfkyx8v6gdr2zflgv0mgbsab"; + sha256 = "19sszb6ac7md494i996ixqmz9b3gim8rrv2nbrmlgjd59gk6hf7b"; fetchSubmodules = true; }; nativeBuildInputs = [ docutils meson ninja pkgconfig ]; - buildInputs = [ dbus glib systemd ]; + buildInputs = [ dbus glib linuxHeaders systemd ]; enableParallelBuilding = true; @@ -27,6 +27,9 @@ stdenv.mkDerivation rec { postInstall = '' install -Dm644 ../README $out/share/doc/dbus-broker/README + + sed -i $out/lib/systemd/{system,user}/dbus-broker.service \ + -e 's,^ExecReload.*busctl,ExecReload=${systemd}/bin/busctl,' ''; checkPhase = "ninja test"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 87e11668d7b..140da3dd2f2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1056,7 +1056,7 @@ with pkgs; devmem2 = callPackage ../os-specific/linux/devmem2 { }; - dbus-broker = callPackage ../os-specific/linux/dbus-broker {}; + dbus-broker = callPackage ../os-specific/linux/dbus-broker { }; ioport = callPackage ../os-specific/linux/ioport {};