From f0a1ab78b492015f8a60bb49065579195fe1dc86 Mon Sep 17 00:00:00 2001 From: Lukas Werling Date: Sun, 27 Aug 2017 19:42:21 +0200 Subject: meson/ninja: add setup hooks (#28444) * Add setupHook for meson/ninja build * libhttpseverywhere: Use meson/ninja setupHooks * jamomacore: Remove superfluous ninja buildInput * Remove obsolete ninja buildPhases These are all handled by ninja's setup hook. * lean2, xcbuild: fix build with ninja setup hook Ninja is a runtime dependency here. However, cmake can generate Ninja build files as well to satisfy the setup hook. * qtwebengine: fix build with ninja setup hook --- pkgs/applications/audio/i-score/default.nix | 4 ---- 1 file changed, 4 deletions(-) (limited to 'pkgs/applications/audio/i-score') diff --git a/pkgs/applications/audio/i-score/default.nix b/pkgs/applications/audio/i-score/default.nix index 1a47b74e21c7..eb2b2ca0702a 100644 --- a/pkgs/applications/audio/i-score/default.nix +++ b/pkgs/applications/audio/i-score/default.nix @@ -67,10 +67,6 @@ stdenv.mkDerivation rec { export CMAKE_PREFIX_PATH="$CMAKE_PREFIX_PATH:$(echo "${jamomacore}/jamoma/share/cmake/Jamoma")" ''; - preBuild = '' - ninja - ''; - installPhase = '' cmake --build . --target install ''; -- cgit 1.4.1