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

dbus-broker: clean up

Browse Source
This commit is contained in:
Jan Tojnar
2018-03-22 10:32:24 +01:00
parent dd556b02ba
commit d04ab628c5
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/os-specific/linux/dbus-broker/default.nix
+2 -9
View File
@@ -17,13 +17,8 @@ stdenv.mkDerivation rec {
buildInputs = [ dbus glib linuxHeaders systemd ]; buildInputs = [ dbus glib linuxHeaders systemd ];
enableParallelBuilding = true; PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system";
PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user";
prePatch = ''
substituteInPlace meson.build \
--replace "dep_systemd.get_pkgconfig_variable('systemdsystemunitdir')" "'$out/lib/systemd/system'" \
--replace "dep_systemd.get_pkgconfig_variable('systemduserunitdir')" "'$out/lib/systemd/user'"
'';
postInstall = '' postInstall = ''
install -Dm644 ../README $out/share/doc/dbus-broker/README install -Dm644 ../README $out/share/doc/dbus-broker/README
@@ -32,8 +27,6 @@ stdenv.mkDerivation rec {
-e 's,^ExecReload.*busctl,ExecReload=${systemd}/bin/busctl,' -e 's,^ExecReload.*busctl,ExecReload=${systemd}/bin/busctl,'
''; '';
checkPhase = "ninja test";
doCheck = true; doCheck = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {