diff --git a/pkgs/applications/audio/i-score/default.nix b/pkgs/applications/audio/i-score/default.nix index 1a47b74e21c..eb2b2ca0702 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 ''; diff --git a/pkgs/applications/graphics/ao/default.nix b/pkgs/applications/graphics/ao/default.nix index 2bba73fae1a..7396fdc045f 100644 --- a/pkgs/applications/graphics/ao/default.nix +++ b/pkgs/applications/graphics/ao/default.nix @@ -18,7 +18,6 @@ stdenv.mkDerivation rec { }; cmakeFlags = "-G Ninja"; - buildPhase = "ninja"; installPhase = '' ninja install cd .. diff --git a/pkgs/applications/science/logic/lean2/default.nix b/pkgs/applications/science/logic/lean2/default.nix index f45f65e9082..2b861b6d06d 100644 --- a/pkgs/applications/science/logic/lean2/default.nix +++ b/pkgs/applications/science/logic/lean2/default.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { cd src ''; + cmakeFlags = [ "-GNinja" ]; + postInstall = '' wrapProgram $out/bin/linja --prefix PATH : $out/bin:${ninja}/bin ''; diff --git a/pkgs/development/libraries/audio/jamomacore/default.nix b/pkgs/development/libraries/audio/jamomacore/default.nix index a3d04fee7f6..5dac4d8e592 100644 --- a/pkgs/development/libraries/audio/jamomacore/default.nix +++ b/pkgs/development/libraries/audio/jamomacore/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, alsaLib, portaudio, portmidi, libsndfile, cmake, libxml2, ninja }: +{ stdenv, fetchFromGitHub, pkgconfig, alsaLib, portaudio, portmidi, libsndfile, cmake, libxml2 }: stdenv.mkDerivation rec { version = "1.0-beta.1"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1hb9b6qc18rsvzvixgllknn756m6zwcn22c79rdibbyz1bhrcnln"; }; - buildInputs = [ pkgconfig alsaLib portaudio portmidi libsndfile cmake libxml2 ninja ]; + buildInputs = [ pkgconfig alsaLib portaudio portmidi libsndfile cmake libxml2 ]; meta = { description = "A C++ platform for building dynamic and reflexive systems with an emphasis on audio and media"; diff --git a/pkgs/development/libraries/libhttpseverywhere/default.nix b/pkgs/development/libraries/libhttpseverywhere/default.nix index 239536140ec..88a3ebbc4fb 100644 --- a/pkgs/development/libraries/libhttpseverywhere/default.nix +++ b/pkgs/development/libraries/libhttpseverywhere/default.nix @@ -15,18 +15,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gnome3.vala valadoc gobjectIntrospection meson ninja pkgconfig ]; buildInputs = [ glib gnome3.libgee libxml2 json_glib libsoup libarchive ]; - configurePhase = '' - mkdir build - cd build - meson --prefix "$out" .. - ''; - - buildPhase = '' - ninja - ''; - - installPhase = "ninja install"; - doCheck = true; checkPhase = "./httpseverywhere_test"; diff --git a/pkgs/development/libraries/qt-5/5.9/qtwebengine/default.nix b/pkgs/development/libraries/qt-5/5.9/qtwebengine/default.nix index 1684e6aac70..c0b9aa83e19 100644 --- a/pkgs/development/libraries/qt-5/5.9/qtwebengine/default.nix +++ b/pkgs/development/libraries/qt-5/5.9/qtwebengine/default.nix @@ -100,6 +100,10 @@ qtSubmodule { xlibs.libXcomposite ]; patches = optional stdenv.needsPax ./qtwebengine-paxmark-mksnapshot.patch; + + dontUseNinjaBuild = true; + dontUseNinjaInstall = true; + postInstall = '' cat > $out/libexec/qt.conf <