diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2018-03-22 08:47:40 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2018-03-22 10:32:24 +0100 |
| commit | d04ab628c515910c709c5bac03a7b53506bf0325 (patch) | |
| tree | edb0bad6581b55e41490d359c8fbb4c6d3b2d724 /pkgs/os-specific/linux/dbus-broker/default.nix | |
| parent | dd556b02baf86e80f1c0a18fbd41366814d82ec3 (diff) | |
| download | nixpkgs-d04ab628c515910c709c5bac03a7b53506bf0325.tar nixpkgs-d04ab628c515910c709c5bac03a7b53506bf0325.tar.gz nixpkgs-d04ab628c515910c709c5bac03a7b53506bf0325.tar.bz2 nixpkgs-d04ab628c515910c709c5bac03a7b53506bf0325.tar.lz nixpkgs-d04ab628c515910c709c5bac03a7b53506bf0325.tar.xz nixpkgs-d04ab628c515910c709c5bac03a7b53506bf0325.tar.zst nixpkgs-d04ab628c515910c709c5bac03a7b53506bf0325.zip | |
dbus-broker: clean up
Diffstat (limited to 'pkgs/os-specific/linux/dbus-broker/default.nix')
| -rw-r--r-- | pkgs/os-specific/linux/dbus-broker/default.nix | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/pkgs/os-specific/linux/dbus-broker/default.nix b/pkgs/os-specific/linux/dbus-broker/default.nix index c97f1b54622..5d0728b7e24 100644 --- a/pkgs/os-specific/linux/dbus-broker/default.nix +++ b/pkgs/os-specific/linux/dbus-broker/default.nix @@ -17,13 +17,8 @@ stdenv.mkDerivation rec { buildInputs = [ dbus glib linuxHeaders systemd ]; - enableParallelBuilding = true; - - 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'" - ''; + PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system"; + PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user"; postInstall = '' install -Dm644 ../README $out/share/doc/dbus-broker/README @@ -32,8 +27,6 @@ stdenv.mkDerivation rec { -e 's,^ExecReload.*busctl,ExecReload=${systemd}/bin/busctl,' ''; - checkPhase = "ninja test"; - doCheck = true; meta = with stdenv.lib; { |