From 6f6a7aae8fd7f8fb7c2c7da0ccaa91820e07912b Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Tue, 5 Sep 2017 09:51:54 +0800 Subject: [PATCH] dbus-broker: meson and ninja hooks handle most things for us --- pkgs/os-specific/linux/dbus-broker/default.nix | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/pkgs/os-specific/linux/dbus-broker/default.nix b/pkgs/os-specific/linux/dbus-broker/default.nix index 3dd63cf02e4..7caf5e359d0 100644 --- a/pkgs/os-specific/linux/dbus-broker/default.nix +++ b/pkgs/os-specific/linux/dbus-broker/default.nix @@ -22,19 +22,11 @@ stdenv.mkDerivation rec { --replace "dep_systemd.get_pkgconfig_variable('systemduserunitdir')" "'$out/lib/systemd/user'" ''; - preConfigure = '' - mkdir build - meson --prefix "$out" --buildtype=release build/ + postInstall = '' + install -Dm644 ../README $out/share/doc/dbus-broker/README ''; - buildPhase = "ninja -C build"; - - installPhase = '' - ninja -C build install - install -Dm644 README $out/share/doc/dbus-broker/README - ''; - - checkPhase = "ninja -C build test"; + checkPhase = "ninja test"; doCheck = true;