treewide: cmake buildInputs to nativeBuildInputs, minor cleanups

This commit is contained in:
Ben Siraphob
2021-01-01 11:52:33 +07:00
parent 54ab07c1fe
commit b04fc593e7
212 changed files with 611 additions and 634 deletions
+2 -3
View File
@@ -47,8 +47,6 @@ in stdenv.mkDerivation {
--replace "#if HAVE_LIBCOMPRESSION" "#if 0"
'';
enableParallelBuilding = true;
# TODO: instruct cmake not to put it in /usr, rather than cleaning up
postInstall = ''
mv $out/usr/* $out
@@ -59,7 +57,8 @@ in stdenv.mkDerivation {
cmakeFlags = [ "-GNinja" ];
buildInputs = [ cmake zlib libxml2 libpng ninja ]
nativeBuildInputs = [ cmake ninja ];
buildInputs = [ zlib libxml2 libpng ]
++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices CoreGraphics ImageIO ];
meta = with stdenv.lib; {