move e11sync-static-manifest to e11sync-static
This commit is contained in:
parent
35f1d8a4fb
commit
450419d431
|
@ -53,9 +53,7 @@
|
|||
inherit geoip2-tarball;
|
||||
};
|
||||
|
||||
e11sync-static = pkgs.callPackage ./pkgs/e11sync-static.nix {};
|
||||
|
||||
e11sync-static-manifest = pkgs.callPackage ./pkgs/e11sync-static-manifest.nix {
|
||||
e11sync-static = pkgs.callPackage ./pkgs/e11sync-static.nix {
|
||||
inherit e11sync-static;
|
||||
};
|
||||
|
||||
|
@ -64,7 +62,8 @@
|
|||
};
|
||||
|
||||
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 {
|
||||
|
@ -74,7 +73,6 @@
|
|||
packages = {
|
||||
inherit geoip-mmdb;
|
||||
inherit e11sync-static;
|
||||
inherit e11sync-static-manifest;
|
||||
inherit e11sync-frontend;
|
||||
inherit e11sync-backend;
|
||||
};
|
||||
|
|
|
@ -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/
|
||||
''
|
|
@ -1,5 +1,6 @@
|
|||
{
|
||||
stdenv,
|
||||
runCommand,
|
||||
python3Packages,
|
||||
coreutils,
|
||||
zopfli,
|
||||
|
@ -7,6 +8,7 @@
|
|||
findutils,
|
||||
dart-sass,
|
||||
gawk,
|
||||
e11sync-static,
|
||||
}:
|
||||
stdenv.mkDerivation {
|
||||
name = "e11sync-static";
|
||||
|
@ -35,4 +37,9 @@ stdenv.mkDerivation {
|
|||
${findutils}/bin/xargs -P''$(${coreutils}/bin/nproc) -I{} $SHELL -c {}
|
||||
'';
|
||||
installPhase = ''mv static $out'';
|
||||
|
||||
passthru.manifest = runCommand "e11sync-static-manifest" {} ''
|
||||
mkdir -p $out/CACHE
|
||||
cp ${e11sync-static}/CACHE/manifest.json $out/CACHE/
|
||||
'';
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue