diff --git a/pkgs/development/libraries/cimg/default.nix b/pkgs/development/libraries/cimg/default.nix index 61d3996a4f5b6..4327a758eec59 100644 --- a/pkgs/development/libraries/cimg/default.nix +++ b/pkgs/development/libraries/cimg/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "dtschump"; repo = "CImg"; rev = "v.${version}"; - sha256 = "1sb0z5ryh34y80ghlr2agsl64gayjmxpl96l9fjaylf5k2m3fg2b"; + sha256 = "sha256-7v8651yDkxTdRMoGhEl4d/k7mxYwfIwW/rkuyjqVGwY="; }; installPhase = '' diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index d38f42e4b3382..6aabd50958cf4 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -70,6 +70,12 @@ stdenv.mkDerivation rec { # CC_FOR_BUILD and CXX_FOR_BUILD are used to bootstrap cmake + '' configureFlags="--parallel=''${NIX_BUILD_CORES:-1} CC=$CC_FOR_BUILD CXX=$CXX_FOR_BUILD $configureFlags" + '' + # Detect dylibs in /usr/lib as system libraries on Darwin to correctly build App bundles + + stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace Modules/GetPrerequisites.cmake --replace \ + "if(resolved_file MATCHES \"^(/System/Library/|/var/empty/lib/)\")" \ + "if(resolved_file MATCHES \"^(/System/Library/|/usr/lib/)\")" ''; configureFlags = [