1

e11-static: contain e11sync-static

TODO: learn about `lib.makeScope`.
This commit is contained in:
Motiejus Jakštys 2024-01-17 12:53:14 +02:00
parent 450419d431
commit 33d6c66029
2 changed files with 35 additions and 36 deletions

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 {};
inherit e11sync-static;
};
e11sync-frontend = pkgs.callPackage ./pkgs/e11sync-frontend.nix { e11sync-frontend = pkgs.callPackage ./pkgs/e11sync-frontend.nix {
inherit e11sync-static; inherit e11sync-static;

View File

@ -8,9 +8,8 @@
findutils, findutils,
dart-sass, dart-sass,
gawk, gawk,
e11sync-static, }: let
}: self = stdenv.mkDerivation {
stdenv.mkDerivation {
name = "e11sync-static"; name = "e11sync-static";
src = ../app; src = ../app;
nativeBuildInputs = [ nativeBuildInputs = [
@ -40,6 +39,8 @@ stdenv.mkDerivation {
passthru.manifest = runCommand "e11sync-static-manifest" {} '' passthru.manifest = runCommand "e11sync-static-manifest" {} ''
mkdir -p $out/CACHE mkdir -p $out/CACHE
cp ${e11sync-static}/CACHE/manifest.json $out/CACHE/ cp ${self}/CACHE/manifest.json $out/CACHE/
''; '';
} };
in
self