From 8bc0c13565733031aa3bc329155f63f9a741456e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= Date: Fri, 19 Jan 2024 13:27:41 +0200 Subject: [PATCH] e11sync-static: do not use intermediate shell --- pkgs/e11sync-static.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/e11sync-static.nix b/pkgs/e11sync-static.nix index 82d2739..2717dc6 100644 --- a/pkgs/e11sync-static.nix +++ b/pkgs/e11sync-static.nix @@ -6,7 +6,6 @@ brotli, findutils, dart-sass, - gawk, }: let self = stdenv.mkDerivation { name = "e11sync-static"; @@ -15,9 +14,6 @@ python3Packages.django python3Packages.django-compressor dart-sass - zopfli - brotli - gawk findutils ]; patchPhase = ''patchShebangs --build manage.py''; @@ -32,8 +28,8 @@ -name '*.css' -or \ -name '*.js' -or \ -name '*.svg' | \ - awk '{print "zopfli \""$0"\"";print "brotli \""$0"\""}' | \ - xargs -P''$(nproc) -I{} $SHELL -c {} + tee >(xargs -n1 -P''$(nproc) ${zopfli}/bin/zopfli) | \ + xargs -n1 -P''$(nproc) ${brotli}/bin/brotli ''; installPhase = ''mv static $out'';