diff options
author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2023-01-27 23:50:36 +0100 |
---|---|---|
committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2023-01-27 23:50:36 +0100 |
commit | 52029b8e00da189520c9dc1d3af7b5cf4dbafbb3 (patch) | |
tree | beccf8346428c1cea814961284ae8c6967d72f72 /pkgs/os-specific/darwin/apple-source-releases | |
parent | 33a54c23be28bea931901c5b468d195d6bb99892 (diff) | |
parent | 91706d179862f3311fa5d27474ffb477a6070f44 (diff) | |
download | nixpkgs-52029b8e00da189520c9dc1d3af7b5cf4dbafbb3.tar nixpkgs-52029b8e00da189520c9dc1d3af7b5cf4dbafbb3.tar.gz nixpkgs-52029b8e00da189520c9dc1d3af7b5cf4dbafbb3.tar.bz2 nixpkgs-52029b8e00da189520c9dc1d3af7b5cf4dbafbb3.tar.lz nixpkgs-52029b8e00da189520c9dc1d3af7b5cf4dbafbb3.tar.xz nixpkgs-52029b8e00da189520c9dc1d3af7b5cf4dbafbb3.tar.zst nixpkgs-52029b8e00da189520c9dc1d3af7b5cf4dbafbb3.zip |
Merge remote-tracking branch 'origin/master' into staging-next
Diffstat (limited to 'pkgs/os-specific/darwin/apple-source-releases')
-rw-r--r-- | pkgs/os-specific/darwin/apple-source-releases/dtrace/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/os-specific/darwin/apple-source-releases/dtrace/default.nix b/pkgs/os-specific/darwin/apple-source-releases/dtrace/default.nix index 1f13cbef9fc..6678f1f5b25 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/dtrace/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/dtrace/default.nix @@ -1,9 +1,9 @@ -{ appleDerivation, xcbuildHook, CoreSymbolication +{ appleDerivation, xcbuildHook, CoreSymbolication, apple_sdk , xnu, bison, flex, darling, stdenv, fixDarwinDylibNames }: appleDerivation { 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: # 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"; |