From fbaface6fff9153488d3c91c5d7eca568386c176 Mon Sep 17 00:00:00 2001 From: Boey Maun Suang Date: Fri, 27 Jan 2023 12:47:22 +1100 Subject: [PATCH] darwin.dtrace: Fix failing build What dtrace needs from the CoreSymbolication private framework on Darwin is provided in Nixpkgs by two different packages, but both of their full attribute paths end in CoreSymbolication. This commit therefore does two things: - adds the second CoreSymbolication package to dtrace's dependencies; and - adds an alias for the second CoreSymbolication package to avoid having to explicitly name or rename it when calling the dtrace package in the existing contexts. --- .../darwin/apple-source-releases/dtrace/default.nix | 4 ++-- 1 file 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 1f13cbef9fc9..6678f1f5b253 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";