lol
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

brotli: revert upstream fix for rpath on darwin

Fixed `aarch64-darwin` built of `curl` reported by Martin Weinelt of
form:

curl-aarch64-darwin> checking run-time libs availability... failed
curl-aarch64-darwin> configure: error: one or more libs available at link-time are not available run-time. Libs used at link-time: -lnghttp2 -lidn2 -lssh2 -lssh2 -lssl -lcrypto -lssl -lcrypto -lgssapi_krb5 -lresolv -lzstd -lzstd -lbrotlidec -lbrotlidec -lz

I think we are embedding wrong runpath. Let's rely on `nixpkgs`'s
infrastructure until the failure is better understood.

+12
+12
pkgs/tools/compression/brotli/default.nix
··· 1 1 { lib 2 2 , stdenv 3 3 , fetchFromGitHub 4 + , fetchpatch 4 5 , cmake 5 6 , staticOnly ? stdenv.hostPlatform.isStatic 6 7 , testers ··· 18 19 rev = "v${finalAttrs.version}"; 19 20 hash = "sha256-MvceRcle2dSkkucC2PlsCizsIf8iv95d8Xjqew266wc="; 20 21 }; 22 + 23 + patches = [ 24 + # revert runpath change, breaks curl on darwin: 25 + # https://github.com/NixOS/nixpkgs/pull/254532#issuecomment-1722337476 26 + (fetchpatch { 27 + name = "revert-runpath.patch"; 28 + url = "https://github.com/google/brotli/commit/f842c1bcf9264431cd3b15429a72b7dafbe80509.patch"; 29 + hash = "sha256-W3LY3EjoHP74YsKOOcYQrzo+f0HbooOvEbnOibtN6TM="; 30 + revert = true; 31 + }) 32 + ]; 21 33 22 34 nativeBuildInputs = [ cmake ]; 23 35