aboutsummaryrefslogtreecommitdiff
path: root/infra/libkookie/nixpkgs/pkgs/tools/compression/brotli/default.nix
diff options
context:
space:
mode:
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/tools/compression/brotli/default.nix')
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/compression/brotli/default.nix22
1 files changed, 15 insertions, 7 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/compression/brotli/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/compression/brotli/default.nix
index bf20e0119ec6..f4f0ac41563a 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/compression/brotli/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/compression/brotli/default.nix
@@ -4,21 +4,22 @@
stdenv.mkDerivation rec {
pname = "brotli";
- version = "1.0.7";
+ version = "1.0.9";
src = fetchFromGitHub {
owner = "google";
repo = "brotli";
rev = "v" + version;
- sha256 = "1811b55wdfg4kbsjcgh1kc938g118jpvif97ilgrmbls25dfpvvw";
+ sha256 = "z6Dhrabav1MDQ4rAcXaDv0aN+qOoh9cvoXZqEWBB13c=";
};
nativeBuildInputs = [ cmake ];
patches = stdenv.lib.optional staticOnly (fetchpatch {
- # from https://github.com/google/brotli/pull/655
- url = "https://github.com/google/brotli/commit/7289e5a378ba13801996a84d89d8fe95c3fc4c11.patch";
- sha256 = "1bghbdvj24jrvb0sqfdif9vwg7wx6pn8dvl6flkrcjkhpj0gi0jg";
+ # 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=";
});
cmakeFlags = []
@@ -32,7 +33,14 @@ stdenv.mkDerivation rec {
# 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";
+ 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.
@@ -61,7 +69,7 @@ stdenv.mkDerivation rec {
'';
license = licenses.mit;
- maintainers = [ maintainers.vcunat ];
+ maintainers = with maintainers; [ freezeboy ];
platforms = platforms.all;
};
}