public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

meson/ninja: add setup hooks (#28444)

Browse Source 
* 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:
Lukas Werling
2017-08-27 19:42:21 +02:00
committed by Robin Gloster
parent cf7be87348
commit f0a1ab78b4
12 changed files with 79 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/tools/xcbuild/default.nix
+2
View File
@@ -50,6 +50,8 @@ in stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = "-Wno-error=strict-aliasing";
cmakeFlags = [ "-GNinja" ];
buildInputs = [ cmake zlib libxml2 libpng ninja ]
++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices CoreGraphics ImageIO ];