dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #212096 from boeyms/fix-darwin.dtrace

Browse Source 
darwin.dtrace: Fix failing build
This commit is contained in:
Weijia Wang 2023-01-27 23:07:57 +01:00 committed by GitHub
commit c5da2d2a89
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/os-specific/darwin/apple-source-releases/dtrace/default.nix
View File

@ -1,9 +1,9 @@
{ appleDerivation, xcbuildHook, CoreSymbolication { appleDerivation, xcbuildHook, CoreSymbolication, apple_sdk
, xnu, bison, flex, darling, stdenv, fixDarwinDylibNames }: , xnu, bison, flex, darling, stdenv, fixDarwinDylibNames }:
appleDerivation { appleDerivation {
nativeBuildInputs = [ xcbuildHook flex bison fixDarwinDylibNames ]; nativeBuildInputs = [ xcbuildHook flex bison fixDarwinDylibNames ];
buildInputs = [ CoreSymbolication darling xnu ]; buildInputs = [ CoreSymbolication apple_sdk.frameworks.CoreSymbolication darling xnu ];
# -fcommon: workaround build failure on -fno-common toolchains: # -fcommon: workaround build failure on -fno-common toolchains:
# duplicate symbol '_kCSRegionMachHeaderName' in: libproc.o dt_module_apple.o # duplicate symbol '_kCSRegionMachHeaderName' in: libproc.o dt_module_apple.o
NIX_CFLAGS_COMPILE = "-DCTF_OLD_VERSIONS -DPRIVATE -DYYDEBUG=1 -I${xnu}/Library/Frameworks/System.framework/Headers -Wno-error=implicit-function-declaration -fcommon"; NIX_CFLAGS_COMPILE = "-DCTF_OLD_VERSIONS -DPRIVATE -DYYDEBUG=1 -I${xnu}/Library/Frameworks/System.framework/Headers -Wno-error=implicit-function-declaration -fcommon";