Skip to content

Commit

Permalink
darwin.CoreSymbolication: fix C99 compilation
Browse files Browse the repository at this point in the history
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
matthewbauer/CoreSymbolication#1

ZHF: NixOS#265948
  • Loading branch information
boltzmannrain committed Nov 19, 2023
1 parent 39c1b48 commit 9ce73e2
Showing 1 changed file with 10 additions and 1 deletion.
11 changes: 10 additions & 1 deletion pkgs/os-specific/darwin/CoreSymbolication/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ lib, fetchFromGitHub, stdenv }:
{ lib, fetchFromGitHub, fetchpatch, stdenv }:

stdenv.mkDerivation {
pname = "core-symbolication";
Expand All @@ -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; {
Expand Down

0 comments on commit 9ce73e2

Please sign in to comment.