summary refs log tree commit diff
path: root/pkgs/servers
diff options
context:
space:
mode:
authorWill Dietz <w@wdtz.org>2018-02-13 15:24:12 -0600
committerWill Dietz <w@wdtz.org>2018-02-20 14:01:18 -0600
commitdf9ebaf8c7dda31cd42e6e897761abe98def7179 (patch)
tree133e319225ba9f790c4bfc1b8dd36803ff09c0db /pkgs/servers
parentb60ef32617383e78c32ca3d69754df5a5f550183 (diff)
downloadnixlib-df9ebaf8c7dda31cd42e6e897761abe98def7179.tar
nixlib-df9ebaf8c7dda31cd42e6e897761abe98def7179.tar.gz
nixlib-df9ebaf8c7dda31cd42e6e897761abe98def7179.tar.bz2
nixlib-df9ebaf8c7dda31cd42e6e897761abe98def7179.tar.lz
nixlib-df9ebaf8c7dda31cd42e6e897761abe98def7179.tar.xz
nixlib-df9ebaf8c7dda31cd42e6e897761abe98def7179.tar.zst
nixlib-df9ebaf8c7dda31cd42e6e897761abe98def7179.zip
nginx/modules: use eustas' brotli module, google one is abandoned
This fork is also used by FreeBSD as of Dec 2017:
https://svnweb.freebsd.org/ports?view=revision&revision=455560

See also:
https://github.com/google/ngx_brotli/issues/62
Diffstat (limited to 'pkgs/servers')
-rw-r--r--pkgs/servers/http/nginx/modules.nix16
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..40eba200c1f0 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 = "47550a25d07363f8eb87ef901b2de5883c46352b";
+      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 ={