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

p4: fix darwin build (#357381)

Browse Source
This commit is contained in:
Aleksana 2024-11-21 21:45:41 +08:00 committed by GitHub
commit 616735586a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/applications/version-management/p4/default.nix
View File

@ -62,7 +62,6 @@ stdenv.mkDerivation (finalAttrs: rec {
++ lib.optionals stdenv.hostPlatform.isLinux [ "-sOSVER=26" ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "-sOSVER=26" ]
++ lib.optionals stdenv.hostPlatform.isDarwin [ ++ lib.optionals stdenv.hostPlatform.isDarwin [
"-sOSVER=1013" "-sOSVER=1013"
"-sMACOSX_SDK=${emptyDirectory}"
"-sLIBC++DIR=${lib.getLib stdenv.cc.libcxx}/lib" "-sLIBC++DIR=${lib.getLib stdenv.cc.libcxx}/lib"
]; ];
@ -81,6 +80,10 @@ stdenv.mkDerivation (finalAttrs: rec {
(stdenv.cc.isClang || (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.cc.version "11.0.0")) (stdenv.cc.isClang || (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.cc.version "11.0.0"))
[ "-include" "limits" "-include" "thread" ]; [ "-include" "limits" "-include" "thread" ];
preBuild = lib.optionalString stdenv.hostPlatform.isDarwin ''
export MACOSX_SDK=$SDKROOT
'';
buildPhase = '' buildPhase = ''
runHook preBuild runHook preBuild
jam $jamFlags -j$NIX_BUILD_CORES p4 jam $jamFlags -j$NIX_BUILD_CORES p4