motiejus
/
e11sync
1
Fork 0
Code

move e11sync-static-manifest to e11sync-static

This commit is contained in:
Motiejus Jakštys 2024-01-17 10:45:16 +02:00
parent 35f1d8a4fb
commit 450419d431
3 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
flake.nix
View File

@ -53,9 +53,7 @@
inherit geoip2-tarball; inherit geoip2-tarball;
}; };
e11sync-static = pkgs.callPackage ./pkgs/e11sync-static.nix {}; e11sync-static = pkgs.callPackage ./pkgs/e11sync-static.nix {
e11sync-static-manifest = pkgs.callPackage ./pkgs/e11sync-static-manifest.nix {
inherit e11sync-static; inherit e11sync-static;
}; };
@ -64,7 +62,8 @@
}; };
e11sync-backend = pkgs.callPackage ./pkgs/e11sync-backend.nix { e11sync-backend = pkgs.callPackage ./pkgs/e11sync-backend.nix {
inherit geoip-mmdb e11sync-static-manifest; inherit geoip-mmdb;
e11sync-static-manifest = e11sync-static.passthru.manifest;
}; };
e11sync-module = import ./modules/e11sync { e11sync-module = import ./modules/e11sync {
@ -74,7 +73,6 @@
packages = { packages = {
inherit geoip-mmdb; inherit geoip-mmdb;
inherit e11sync-static; inherit e11sync-static;
inherit e11sync-static-manifest;
inherit e11sync-frontend; inherit e11sync-frontend;
inherit e11sync-backend; inherit e11sync-backend;
}; };

10
pkgs/e11sync-static-manifest.nix
View File

@ -1,10 +0,0 @@
{
runCommand,
e11sync-static,
}:
runCommand "e11sync-static-manifest" {
nativeBuildInputs = [e11sync-static];
} ''
mkdir -p $out/CACHE
cp ${e11sync-static}/CACHE/manifest.json $out/CACHE/
''

7
pkgs/e11sync-static.nix
View File

@ -1,5 +1,6 @@
{ {
stdenv, stdenv,
runCommand,
python3Packages, python3Packages,
coreutils, coreutils,
zopfli, zopfli,
@ -7,6 +8,7 @@
findutils, findutils,
dart-sass, dart-sass,
gawk, gawk,
e11sync-static,
}: }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "e11sync-static"; name = "e11sync-static";
@ -35,4 +37,9 @@ stdenv.mkDerivation {
${findutils}/bin/xargs -P''$(${coreutils}/bin/nproc) -I{} $SHELL -c {} ${findutils}/bin/xargs -P''$(${coreutils}/bin/nproc) -I{} $SHELL -c {}
''; '';
installPhase = ''mv static $out''; installPhase = ''mv static $out'';
passthru.manifest = runCommand "e11sync-static-manifest" {} ''
mkdir -p $out/CACHE
cp ${e11sync-static}/CACHE/manifest.json $out/CACHE/
'';
} }