mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-19 04:02:10 +00:00
Code Issues Wiki Activity

brotli: revert upstream fix for rpath on darwin

Browse source 
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.
This commit is contained in:
Sergei Trofimovich 2023-09-17 10:39:26 +01:00
parent 0181f1d78c
commit 25afc4a910
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/tools/compression/brotli/default.nix
View file

@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, cmake
, staticOnly ? stdenv.hostPlatform.isStatic
, testers
@ -19,6 +20,17 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-MvceRcle2dSkkucC2PlsCizsIf8iv95d8Xjqew266wc=";
};
patches = [
# revert runpath change, breaks curl on darwin:
# https://github.com/NixOS/nixpkgs/pull/254532#issuecomment-1722337476
(fetchpatch {
name = "revert-runpath.patch";
url = "https://github.com/google/brotli/commit/f842c1bcf9264431cd3b15429a72b7dafbe80509.patch";
hash = "sha256-W3LY3EjoHP74YsKOOcYQrzo+f0HbooOvEbnOibtN6TM=";
revert = true;
})
];
nativeBuildInputs = [ cmake ];
cmakeFlags = lib.optional staticOnly "-DBUILD_SHARED_LIBS=OFF";