summary refs log tree commit diff
path: root/pkgs/os-specific/darwin/apple-source-releases
diff options
context:
space:
mode:
authorBoey Maun Suang <account-at-github@boeyms.info>2023-01-27 12:47:22 +1100
committerBoey Maun Suang <account-at-github@boeyms.info>2023-01-27 12:47:22 +1100
commitfbaface6fff9153488d3c91c5d7eca568386c176 (patch)
tree106848381f822cb9a1eabb9532288f2dab51f3af /pkgs/os-specific/darwin/apple-source-releases
parent2b175a1e0f511ce6e51ab1d3e39eacf9037b1cc5 (diff)
downloadnixpkgs-fbaface6fff9153488d3c91c5d7eca568386c176.tar
nixpkgs-fbaface6fff9153488d3c91c5d7eca568386c176.tar.gz
nixpkgs-fbaface6fff9153488d3c91c5d7eca568386c176.tar.bz2
nixpkgs-fbaface6fff9153488d3c91c5d7eca568386c176.tar.lz
nixpkgs-fbaface6fff9153488d3c91c5d7eca568386c176.tar.xz
nixpkgs-fbaface6fff9153488d3c91c5d7eca568386c176.tar.zst
nixpkgs-fbaface6fff9153488d3c91c5d7eca568386c176.zip
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.
Diffstat (limited to 'pkgs/os-specific/darwin/apple-source-releases')
-rw-r--r--pkgs/os-specific/darwin/apple-source-releases/dtrace/default.nix4
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";