diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2022-10-19 05:24:28 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2022-10-19 05:24:28 +0200 |
| commit | 457f28f6f85eea1b1671d62d2abe39297c9c90f7 (patch) | |
| tree | 3c6e68534e7bfcde19893c830af7498b0606e6d2 /pkgs/servers/peertube/default.nix | |
| parent | a25e03e76ae1e0367419db1de009e1139d08de68 (diff) | |
| parent | 1aa7d4e6c61526606d9e26f939cdb60ec8f45fcd (diff) | |
Merge branch 'master' into staging-next
; Conflicts: ; pkgs/development/tools/codespell/default.nix codespell 2.2.2 switched to pyproject & setuptools_scm: https://github.com/codespell-project/codespell/pull/2523
Diffstat (limited to 'pkgs/servers/peertube/default.nix')
| -rw-r--r-- | pkgs/servers/peertube/default.nix | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/pkgs/servers/peertube/default.nix b/pkgs/servers/peertube/default.nix index 29e082e65cf2e..9ddad4fad1e89 100644 --- a/pkgs/servers/peertube/default.nix +++ b/pkgs/servers/peertube/default.nix @@ -1,16 +1,5 @@ -{ lib -, stdenv -, callPackage -, fetchurl -, fetchFromGitHub -, buildGoModule -, fetchYarnDeps -, nixosTests -, fixup_yarn_lock -, jq -, nodejs -, which -, yarn +{ lib, stdenv, callPackage, fetchurl, fetchFromGitHub, fetchYarnDeps, nixosTests +, brotli, fixup_yarn_lock, jq, nodejs, which, yarn }: let arch = @@ -49,7 +38,7 @@ in stdenv.mkDerivation rec { hash = "sha256-IKMu+gQa+d30+yXjHCu/oQOQXL6kTN9WxDI/Y5IL1E8="; }; - nativeBuildInputs = [ fixup_yarn_lock jq nodejs which yarn ]; + nativeBuildInputs = [ brotli fixup_yarn_lock jq nodejs which yarn ]; buildPhase = '' # Build node modules @@ -105,6 +94,12 @@ in stdenv.mkDerivation rec { mkdir $out/client mv ~/client/{dist,node_modules,package.json,yarn.lock} $out/client mv ~/{config,scripts,support,CREDITS.md,FAQ.md,LICENSE,README.md,package.json,tsconfig.json,yarn.lock} $out + + # Create static gzip and brotli files + find $out/client/dist -type f -regextype posix-extended -iregex '.*\.(css|eot|html|js|json|svg|webmanifest|xlf)' | while read file; do + gzip -9 -n -c $file > $file.gz + brotli --best -f $file -o $file.br + done ''; passthru.tests.peertube = nixosTests.peertube; |