diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-11-21 16:12:21 +0100 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-11-21 16:12:48 +0100 |
commit | 048a4cd441a59cbf89defb18bb45c9f0b4429b35 (patch) | |
tree | f8f5850ff05521ab82d65745894714a8796cbfb6 /pkgs/tools/compression/brotli/default.nix | |
parent | 030c5028b07afcedce7c5956015c629486cc79d9 (diff) | |
parent | 4c2d05dd6435d449a3651a6dd314d9411b5f8146 (diff) | |
download | nixpkgs-048a4cd441a59cbf89defb18bb45c9f0b4429b35.tar nixpkgs-048a4cd441a59cbf89defb18bb45c9f0b4429b35.tar.gz nixpkgs-048a4cd441a59cbf89defb18bb45c9f0b4429b35.tar.bz2 nixpkgs-048a4cd441a59cbf89defb18bb45c9f0b4429b35.tar.lz nixpkgs-048a4cd441a59cbf89defb18bb45c9f0b4429b35.tar.xz nixpkgs-048a4cd441a59cbf89defb18bb45c9f0b4429b35.tar.zst nixpkgs-048a4cd441a59cbf89defb18bb45c9f0b4429b35.zip |
Signed-off-by: Alyssa Ross <hi@alyssa.is>
Diffstat (limited to 'pkgs/tools/compression/brotli/default.nix')
-rw-r--r-- | pkgs/tools/compression/brotli/default.nix | 35 |
1 files changed, 14 insertions, 21 deletions
diff --git a/pkgs/tools/compression/brotli/default.nix b/pkgs/tools/compression/brotli/default.nix index 3d15cbd395c..263478e4ba3 100644 --- a/pkgs/tools/compression/brotli/default.nix +++ b/pkgs/tools/compression/brotli/default.nix @@ -1,8 +1,8 @@ { lib , stdenv , fetchFromGitHub -, cmake , fetchpatch +, cmake , staticOnly ? stdenv.hostPlatform.isStatic , testers }: @@ -11,23 +11,27 @@ stdenv.mkDerivation (finalAttrs: { pname = "brotli"; - version = "1.0.9"; + version = "1.1.0"; src = fetchFromGitHub { owner = "google"; repo = "brotli"; rev = "v${finalAttrs.version}"; - sha256 = "z6Dhrabav1MDQ4rAcXaDv0aN+qOoh9cvoXZqEWBB13c="; + hash = "sha256-MvceRcle2dSkkucC2PlsCizsIf8iv95d8Xjqew266wc="; }; - nativeBuildInputs = [ cmake ]; + 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; + }) + ]; - patches = lib.optional staticOnly (fetchpatch { - # context from https://github.com/google/brotli/pull/655 - # updated patch from https://github.com/google/brotli/pull/655 - url = "https://github.com/google/brotli/commit/47a554804ceabb899ae924aaee54df806053d0d1.patch"; - sha256 = "sOeXNVsCaBSD9i82GRUDrkyreGeQ7qaJWjjy/uLL0/0="; - }); + nativeBuildInputs = [ cmake ]; cmakeFlags = lib.optional staticOnly "-DBUILD_SHARED_LIBS=OFF"; @@ -37,17 +41,6 @@ stdenv.mkDerivation (finalAttrs: { checkTarget = "test"; - # This breaks on Darwin because our cmake hook tries to make a build folder - # and the wonderful bazel BUILD file is already there (yay case-insensitivity?) - prePatch = '' - rm BUILD - - # Upstream fixed this reference to runtime-path after the release - # and with this references g++ complains about invalid option -R - sed -i 's/ -R''${libdir}//' scripts/libbrotli*.pc.in - cat scripts/libbrotli*.pc.in - ''; - # Don't bother with "man" output for now, # it currently only makes the manpages hard to use. postInstall = '' |