diff options
| author | Dmitry Ivankov <boltzmannrain@gmail.com> | 2023-11-19 15:57:44 +0100 |
|---|---|---|
| committer | Dmitry Ivankov <boltzmannrain@gmail.com> | 2023-11-19 15:59:22 +0100 |
| commit | 9ce73e272faa38c4802e5d54e0efac6216e4ffe7 (patch) | |
| tree | c23d78de0d85e7b45e1f453bb69de96930458731 /pkgs/os-specific/darwin | |
| parent | 39c1b481272ca66f19b4ddd06afa87148bbcef95 (diff) | |
darwin.CoreSymbolication: fix C99 compilation
https://hydra.nixos.org/build/241116326/nixlog/1 ``` build flags: SHELL=/nix/store/x1xxsh1gp6y389hyl40a0i74dkxiprl7-bash-5.2-p15/bin/bash PREFIX=\$\(out\) CC=cc cc -F/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include -fblocks -c -o CoreSymbolication.o CoreSymbolication.c In file included from CoreSymbolication.c:1: ./CoreSymbolication.h:393:1: error: type specifier missing, defaults to 'int'; ISO C99 and later do not support implicit int [-Wimplicit-int] CSSymbolOwnerSetTransientUserData(CSSymbolOwnerRef owner, uint32_t gen); ^ int 1 error generated. ``` Also submitted patch upstream at https://github.com/matthewbauer/CoreSymbolication/pull/1 ZHF: #265948
Diffstat (limited to 'pkgs/os-specific/darwin')
| -rw-r--r-- | pkgs/os-specific/darwin/CoreSymbolication/default.nix | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/os-specific/darwin/CoreSymbolication/default.nix b/pkgs/os-specific/darwin/CoreSymbolication/default.nix index 5cf92a41a6f83..d9a2b378134a2 100644 --- a/pkgs/os-specific/darwin/CoreSymbolication/default.nix +++ b/pkgs/os-specific/darwin/CoreSymbolication/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, stdenv }: +{ lib, fetchFromGitHub, fetchpatch, stdenv }: stdenv.mkDerivation { pname = "core-symbolication"; @@ -11,6 +11,15 @@ stdenv.mkDerivation { hash = "sha256-PzvLq94eNhP0+rLwGMKcMzxuD6MlrNI7iT/eV0obtSE="; }; + patches = [ + # C99 compilation fix + # https://github.com/matthewbauer/CoreSymbolication/pull/1 + (fetchpatch { + url = "https://github.com/boltzmannrain/CoreSymbolication/commit/1c26cc93f260bda9230a93e91585284e80aa231f.patch"; + hash = "sha256-d/ieDEnvZ9kVOjBVUdJzGmdvC1AF3Jk4fbwp04Q6l/I="; + }) + ]; + makeFlags = [ "PREFIX=$(out)" "CC=${stdenv.cc.targetPrefix}cc" ]; meta = with lib; { |