diff options
author | Lukas Werling <lukas.werling@gmail.com> | 2017-08-27 19:42:21 +0200 |
---|---|---|
committer | Robin Gloster <mail@glob.in> | 2017-08-27 19:42:21 +0200 |
commit | f0a1ab78b492015f8a60bb49065579195fe1dc86 (patch) | |
tree | b6ab83e33ebded59238ab828f7f24d535e4df789 /pkgs/development/libraries/audio | |
parent | cf7be87348667e92cc9d02da53628401c2f40cba (diff) |
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/audio')
-rw-r--r-- | pkgs/development/libraries/audio/jamomacore/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/audio/jamomacore/default.nix b/pkgs/development/libraries/audio/jamomacore/default.nix index a3d04fee7f64..5dac4d8e5925 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"; |