From d12975a5c48912b4bcf2b8b9c1a7ee982c65d95d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 10 Jul 2026 12:29:48 -0700 Subject: [PATCH] immich: inline plugin-core and web --- pkgs/by-name/im/immich/package.nix | 69 +++--------------------------- 1 file changed, 6 insertions(+), 63 deletions(-) diff --git a/pkgs/by-name/im/immich/package.nix b/pkgs/by-name/im/immich/package.nix index 8012f5db51a7..6f20483c95f0 100644 --- a/pkgs/by-name/im/immich/package.nix +++ b/pkgs/by-name/im/immich/package.nix @@ -137,6 +137,8 @@ stdenv.mkDerivation (finalAttrs: { ''; nativeBuildInputs = [ + binaryen + extism-js nodejs pkg-config pnpmConfigHook @@ -174,7 +176,7 @@ stdenv.mkDerivation (finalAttrs: { # If exiftool-vendored.pl isn't found, exiftool is searched for on the PATH rm node_modules/.pnpm/node_modules/exiftool-vendored.pl - pnpm --filter immich... build + pnpm --filter immich... --filter immich-web... --filter @immich/plugin-core... build runHook postBuild ''; @@ -196,9 +198,9 @@ stdenv.mkDerivation (finalAttrs: { -o -name '*.target.mk' \ \) -exec rm -r {} + - mkdir -p "$packageOut/build/plugins" - ln -s '${finalAttrs.plugin-core}' "$packageOut/build/plugins/immich-plugin-core" - ln -s '${finalAttrs.web}' "$packageOut/build/www" + mkdir -p "$packageOut/build/plugins/immich-plugin-core" + cp -r packages/plugin-core/{dist,manifest.json} "$packageOut/build/plugins/immich-plugin-core/" + cp -r web/build "$packageOut/build/www" ln -s '${geodata}' "$packageOut/build/geodata" echo '${builtins.toJSON buildLock}' > "$packageOut/build/build-lock.json" @@ -222,65 +224,6 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; - plugin-core = stdenv.mkDerivation { - pname = "immich-plugin-core"; - inherit (finalAttrs) version src pnpmDeps; - - nativeBuildInputs = [ - binaryen - extism-js - nodejs - pnpmConfigHook - pnpm - ]; - - buildPhase = '' - runHook preBuild - - pnpm --filter @immich/plugin-core... build - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - cd packages/plugin-core - mkdir $out - cp -r dist manifest.json $out - - runHook postInstall - ''; - }; - - web = stdenv.mkDerivation { - pname = "immich-web"; - inherit (finalAttrs) version src pnpmDeps; - - nativeBuildInputs = [ - nodejs - pnpmConfigHook - pnpm - ]; - - buildPhase = '' - runHook preBuild - - pnpm --filter immich-web... build - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - cd web - cp -r build $out - - runHook postInstall - ''; - }; - passthru = { tests = { inherit (nixosTests) immich immich-vectorchord-reindex;