1

e11sync-static: do not use intermediate shell

This commit is contained in:
Motiejus Jakštys 2024-01-19 13:27:41 +02:00
parent 7254e784eb
commit 8bc0c13565

View File

@ -6,7 +6,6 @@
brotli, brotli,
findutils, findutils,
dart-sass, dart-sass,
gawk,
}: let }: let
self = stdenv.mkDerivation { self = stdenv.mkDerivation {
name = "e11sync-static"; name = "e11sync-static";
@ -15,9 +14,6 @@
python3Packages.django python3Packages.django
python3Packages.django-compressor python3Packages.django-compressor
dart-sass dart-sass
zopfli
brotli
gawk
findutils findutils
]; ];
patchPhase = ''patchShebangs --build manage.py''; patchPhase = ''patchShebangs --build manage.py'';
@ -32,8 +28,8 @@
-name '*.css' -or \ -name '*.css' -or \
-name '*.js' -or \ -name '*.js' -or \
-name '*.svg' | \ -name '*.svg' | \
awk '{print "zopfli \""$0"\"";print "brotli \""$0"\""}' | \ tee >(xargs -n1 -P''$(nproc) ${zopfli}/bin/zopfli) | \
xargs -P''$(nproc) -I{} $SHELL -c {} xargs -n1 -P''$(nproc) ${brotli}/bin/brotli
''; '';
installPhase = ''mv static $out''; installPhase = ''mv static $out'';