diff options
| author | Peter Hoeg <peter@hoeg.com> | 2018-02-22 17:42:18 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-22 17:42:18 +0800 |
| commit | 1c67ee4ff6b3b0b500197713631e5dce5bbbce06 (patch) | |
| tree | 99074d7f8cbcb55099345d1eda8313eea41c55b8 | |
| parent | 1fa60974e723bdcf7073d23399d506c4cbd7bb32 (diff) | |
| parent | eb5ad9bb0cb57c06690e85770b0d5d65555c0954 (diff) | |
| download | nixlib-1c67ee4ff6b3b0b500197713631e5dce5bbbce06.tar nixlib-1c67ee4ff6b3b0b500197713631e5dce5bbbce06.tar.gz nixlib-1c67ee4ff6b3b0b500197713631e5dce5bbbce06.tar.bz2 nixlib-1c67ee4ff6b3b0b500197713631e5dce5bbbce06.tar.lz nixlib-1c67ee4ff6b3b0b500197713631e5dce5bbbce06.tar.xz nixlib-1c67ee4ff6b3b0b500197713631e5dce5bbbce06.tar.zst nixlib-1c67ee4ff6b3b0b500197713631e5dce5bbbce06.zip | |
Merge pull request #35325 from peterhoeg/u/dbusb
dbus-broker: 9 -> 11
| -rw-r--r-- | pkgs/os-specific/linux/dbus-broker/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 8 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/dbus-broker/default.nix b/pkgs/os-specific/linux/dbus-broker/default.nix index 51d0fb5e1254..c97f1b54622a 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 87e11668d7b6..140da3dd2f2b 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 {}; |