summary refs log tree commit diff
path: root/pkgs/development/libraries
diff options
context:
space:
mode:
authorLukas Werling <lukas.werling@gmail.com>2017-08-27 19:42:21 +0200
committerRobin Gloster <mail@glob.in>2017-08-27 19:42:21 +0200
commitf0a1ab78b492015f8a60bb49065579195fe1dc86 (patch)
treeb6ab83e33ebded59238ab828f7f24d535e4df789 /pkgs/development/libraries
parentcf7be87348667e92cc9d02da53628401c2f40cba (diff)
downloadnixpkgs-f0a1ab78b492015f8a60bb49065579195fe1dc86.tar
nixpkgs-f0a1ab78b492015f8a60bb49065579195fe1dc86.tar.gz
nixpkgs-f0a1ab78b492015f8a60bb49065579195fe1dc86.tar.bz2
nixpkgs-f0a1ab78b492015f8a60bb49065579195fe1dc86.tar.lz
nixpkgs-f0a1ab78b492015f8a60bb49065579195fe1dc86.tar.xz
nixpkgs-f0a1ab78b492015f8a60bb49065579195fe1dc86.tar.zst
nixpkgs-f0a1ab78b492015f8a60bb49065579195fe1dc86.zip
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
Diffstat (limited to 'pkgs/development/libraries')
-rw-r--r--pkgs/development/libraries/audio/jamomacore/default.nix4
-rw-r--r--pkgs/development/libraries/libhttpseverywhere/default.nix12
-rw-r--r--pkgs/development/libraries/qt-5/5.9/qtwebengine/default.nix4
3 files changed, 6 insertions, 14 deletions
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 <<EOF
     [Paths]