public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #35325 from peterhoeg/u/dbusb

Browse Source 
dbus-broker: 9 -> 11
This commit is contained in:
Peter Hoeg 2018-02-22 17:42:18 +08:00 committed by GitHub
commit 1c67ee4ff6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/os-specific/linux/dbus-broker/default.nix
View File

@ -1,21 +1,21 @@
{ stdenv, fetchgit, fetchFromGitHub, docutils, meson, ninja, pkgconfig { stdenv, fetchgit, fetchFromGitHub, docutils, meson, ninja, pkgconfig
, dbus, glib, systemd }: , dbus, glib, linuxHeaders, systemd }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "dbus-broker-${version}"; name = "dbus-broker-${version}";
version = "9"; version = "11";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bus1"; owner = "bus1";
repo = "dbus-broker"; repo = "dbus-broker";
rev = "v${version}"; rev = "v${version}";
sha256 = "0q0kbinkkia96bsy7jczlyjz8xgdrfkyx8v6gdr2zflgv0mgbsab"; sha256 = "19sszb6ac7md494i996ixqmz9b3gim8rrv2nbrmlgjd59gk6hf7b";
fetchSubmodules = true; fetchSubmodules = true;
}; };
nativeBuildInputs = [ docutils meson ninja pkgconfig ]; nativeBuildInputs = [ docutils meson ninja pkgconfig ];
buildInputs = [ dbus glib systemd ]; buildInputs = [ dbus glib linuxHeaders systemd ];
enableParallelBuilding = true; enableParallelBuilding = true;
@ -27,6 +27,9 @@ stdenv.mkDerivation rec {
postInstall = '' postInstall = ''
install -Dm644 ../README $out/share/doc/dbus-broker/README 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"; checkPhase = "ninja test";

2
pkgs/top-level/all-packages.nix
View File

@ -1056,7 +1056,7 @@ with pkgs;
devmem2 = callPackage ../os-specific/linux/devmem2 { }; 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 {}; ioport = callPackage ../os-specific/linux/ioport {};