diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2024-04-29 09:34:08 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-04-29 09:34:08 +0200 |
commit | 368b2d71b474364c86a67f09b5aeb8e56ebbbeb3 (patch) | |
tree | 8fdf841e377c9bd24b5a6e9b40417948da1bcc2a /nixos/modules | |
parent | e40ae4e4148a313078aa5ed444796dbe855b5482 (diff) | |
parent | 13852fc9ad82314bde3de1badb4097eb7526d921 (diff) |
Merge pull request #307130 from toastal/movim-no-parallel
movim: include authentication patch & remove parallel dependency
Diffstat (limited to 'nixos/modules')
-rw-r--r-- | nixos/modules/services/web-apps/movim.nix | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/nixos/modules/services/web-apps/movim.nix b/nixos/modules/services/web-apps/movim.nix index bb88a185b4618..29bed0e067fa4 100644 --- a/nixos/modules/services/web-apps/movim.nix +++ b/nixos/modules/services/web-apps/movim.nix @@ -103,22 +103,20 @@ let lib.concatStringsSep "\n" [ (lib.optionalString brotli.enable '' echo -n "Precompressing static files with Brotli …" - find ${appDir}/public -type f ${findTextFileNames} \ - | ${lib.getExe pkgs.parallel} ${lib.escapeShellArgs [ - "--will-cite" - "-j $NIX_BUILD_CORES" - "${lib.getExe brotli.package} --keep --quality=${builtins.toString brotli.compressionLevel} --output={}.br {}" - ]} + find ${appDir}/public -type f ${findTextFileNames} -print0 \ + | xargs -0 -n 1 -P $NIX_BUILD_CORES ${pkgs.writeShellScript "movim_precompress_broti" '' + file="$1" + ${lib.getExe brotli.package} --keep --quality=${builtins.toString brotli.compressionLevel} --output=$file.br $file + ''} echo " done." '') (lib.optionalString gzip.enable '' echo -n "Precompressing static files with Gzip …" - find ${appDir}/public -type f ${findTextFileNames} \ - | ${lib.getExe pkgs.parallel} ${lib.escapeShellArgs [ - "--will-cite" - "-j $NIX_BUILD_CORES" - "${lib.getExe gzip.package} -c -${builtins.toString gzip.compressionLevel} {} > {}.gz" - ]} + find ${appDir}/public -type f ${findTextFileNames} -print0 \ + | xargs -0 -n 1 -P $NIX_BUILD_CORES ${pkgs.writeShellScript "movim_precompress_broti" '' + file="$1" + ${lib.getExe gzip.package} -c -${builtins.toString gzip.compressionLevel} $file > $file.gz + ''} echo " done." '') ]; |