about summary refs log tree commit diff
diff options
context:
space:
mode:
authorsterni <sternenseemann@systemli.org>2022-05-19T08·45+0200
committerclbot <clbot@tvl.fyi>2022-05-19T09·23+0000
commit92a0d9f7da3c6c9a7fd2d36970e7ca3f38323e29 (patch)
treeb66a194cd45f3d25d7831cece1be33a8642daf1e
parent40803d9c6d1cf1acc286a40e400c8972ad5ce8d0 (diff)
fix(3p/cgit): substitute newly supported compression tools r/4095
This code is copied from the cgit derivation in nixpkgs, seems like we
missed when these new compression methods were added.

Change-Id: I2d4118785abc173c86ac92e3007cd7027a1e0496
Reviewed-on: https://cl.tvl.fyi/c/depot/+/5637
Autosubmit: sterni <sternenseemann@systemli.org>
Reviewed-by: tazjin <tazjin@tvl.su>
Tested-by: BuildkiteCI
-rw-r--r--third_party/cgit/default.nix4
1 files changed, 3 insertions, 1 deletions
diff --git a/third_party/cgit/default.nix b/third_party/cgit/default.nix
index 47c0de0d65..5f8e069a4e 100644
--- a/third_party/cgit/default.nix
+++ b/third_party/cgit/default.nix
@@ -1,7 +1,7 @@
 { depot, lib, pkgs, ... }:
 
 let
-  inherit (pkgs) stdenv gzip bzip2 xz luajit zlib autoconf openssl pkgconfig;
+  inherit (pkgs) stdenv gzip bzip2 xz lzip zstd zlib openssl;
 in
 stdenv.mkDerivation rec {
   pname = "cgit-pink";
@@ -15,7 +15,9 @@ stdenv.mkDerivation rec {
   postPatch = ''
     sed -e 's|"gzip"|"${gzip}/bin/gzip"|' \
         -e 's|"bzip2"|"${bzip2.bin}/bin/bzip2"|' \
+        -e 's|"lzip"|"${lzip}/bin/lzip"|' \
         -e 's|"xz"|"${xz.bin}/bin/xz"|' \
+        -e 's|"zstd"|"${zstd}/bin/zstd"|' \
         -i ui-snapshot.c
   '';