diff options
| author | Will Dietz <github@wdtz.org> | 2018-02-23 10:13:08 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-23 10:13:08 -0600 |
| commit | 22b5aebe9d29bee21f246ca68b1dbdd24266154d (patch) | |
| tree | d1f3ab64d71bda377ec50ed1ed7f02fcd1259086 /pkgs/servers | |
| parent | 9c1c424e525b637560d91b99430b83cdaed24820 (diff) | |
| parent | 40b14109d34453b3178c637c9d33061ed3a5c579 (diff) | |
| download | nixlib-22b5aebe9d29bee21f246ca68b1dbdd24266154d.tar nixlib-22b5aebe9d29bee21f246ca68b1dbdd24266154d.tar.gz nixlib-22b5aebe9d29bee21f246ca68b1dbdd24266154d.tar.bz2 nixlib-22b5aebe9d29bee21f246ca68b1dbdd24266154d.tar.lz nixlib-22b5aebe9d29bee21f246ca68b1dbdd24266154d.tar.xz nixlib-22b5aebe9d29bee21f246ca68b1dbdd24266154d.tar.zst nixlib-22b5aebe9d29bee21f246ca68b1dbdd24266154d.zip | |
Merge pull request #34943 from dtzWill/feature/ngx_brotli-eustas
nginx/modules: use eustas' brotli module, google one is abandoned
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/http/nginx/modules.nix | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 780f20017982..32d1523547e6 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -2,13 +2,17 @@ { brotli = { - src = fetchFromGitHub { - owner = "google"; + src = let gitsrc = pkgs.fetchFromGitHub { + owner = "eustas"; repo = "ngx_brotli"; - rev = "bfd2885b2da4d763fed18f49216bb935223cd34b"; - sha256 = "04yx1n0wi3l2x37jd1ynl9951qxkn8xp42yv0mfp1qz9svips81n"; - fetchSubmodules = true; - }; + rev = "8cd9dd5fc232d3a01644584921e52dae99034779"; + sha256 = "0ap1kf51hzb8yvvxjkcj9hnmsmmd5drcay64hd4n7vybf9dqw6g6"; + }; in pkgs.runCommandNoCC "ngx_brotli-src" {} '' + cp -a ${gitsrc} $out + substituteInPlace $out/config \ + --replace /usr/local ${lib.getDev pkgs.brotli} + ''; + inputs = [ pkgs.brotli ]; }; rtmp ={ |