diff options
| author | Ben Siraphob <bensiraphob@gmail.com> | 2020-12-31 14:48:55 +0700 |
|---|---|---|
| committer | Ben Siraphob <bensiraphob@gmail.com> | 2021-01-01 11:52:33 +0700 |
| commit | b04fc593e7b55fe1f74421b11589f12a339c92e2 (patch) | |
| tree | fa9bbaeb68f1e0cfa6ea2f9580ea2892eed41b3e /pkgs/development/tools/xcbuild | |
| parent | 54ab07c1fe4e39c5a84834f85300c63e3809ac2d (diff) | |
| download | nixpkgs-b04fc593e7b55fe1f74421b11589f12a339c92e2.tar nixpkgs-b04fc593e7b55fe1f74421b11589f12a339c92e2.tar.gz nixpkgs-b04fc593e7b55fe1f74421b11589f12a339c92e2.tar.bz2 nixpkgs-b04fc593e7b55fe1f74421b11589f12a339c92e2.tar.lz nixpkgs-b04fc593e7b55fe1f74421b11589f12a339c92e2.tar.xz nixpkgs-b04fc593e7b55fe1f74421b11589f12a339c92e2.tar.zst nixpkgs-b04fc593e7b55fe1f74421b11589f12a339c92e2.zip | |
treewide: cmake buildInputs to nativeBuildInputs, minor cleanups
Diffstat (limited to 'pkgs/development/tools/xcbuild')
| -rw-r--r-- | pkgs/development/tools/xcbuild/default.nix | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/development/tools/xcbuild/default.nix b/pkgs/development/tools/xcbuild/default.nix index cb2e6edd0e1..f02933e921e 100644 --- a/pkgs/development/tools/xcbuild/default.nix +++ b/pkgs/development/tools/xcbuild/default.nix @@ -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; { |