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
This commit is contained in:
committed by
Robin Gloster
parent
cf7be87348
commit
f0a1ab78b4
@@ -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";
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -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]
|
||||
|
||||
Reference in New Issue
Block a user