diff options
author | Peter Hoeg <peter@hoeg.com> | 2018-02-22 11:52:04 +0800 |
---|---|---|
committer | Peter Hoeg <peter@hoeg.com> | 2018-02-22 17:32:27 +0800 |
commit | eb5ad9bb0cb57c06690e85770b0d5d65555c0954 (patch) | |
tree | a1640b4a04ddb592c8b1cafbbc6dc3283ea50a23 | |
parent | 8b1cf100cd8badad6e1b6d4650b904b88aa870db (diff) | |
download | nixlib-eb5ad9bb0cb57c06690e85770b0d5d65555c0954.tar nixlib-eb5ad9bb0cb57c06690e85770b0d5d65555c0954.tar.gz nixlib-eb5ad9bb0cb57c06690e85770b0d5d65555c0954.tar.bz2 nixlib-eb5ad9bb0cb57c06690e85770b0d5d65555c0954.tar.lz nixlib-eb5ad9bb0cb57c06690e85770b0d5d65555c0954.tar.xz nixlib-eb5ad9bb0cb57c06690e85770b0d5d65555c0954.tar.zst nixlib-eb5ad9bb0cb57c06690e85770b0d5d65555c0954.zip |
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 | 4 |
2 files changed, 9 insertions, 6 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 911c13fbe29b..e6caf1b4bc00 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1047,7 +1047,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 {}; @@ -5755,7 +5755,7 @@ with pkgs; compcert = callPackage ../development/compilers/compcert { }; cpp-gsl = callPackage ../development/libraries/cpp-gsl { }; - + # Users installing via `nix-env` will likely be using the REPL, # which has a hard dependency on Z3, so make sure it is available. cryptol = haskellPackages.cryptol.overrideDerivation (oldAttrs: { |