diff --git a/pkgs/by-name/op/opencloud/idp-web.nix b/pkgs/by-name/op/opencloud/idp-web.nix index 7ccd783a0563..8cb818fe0ad5 100644 --- a/pkgs/by-name/op/opencloud/idp-web.nix +++ b/pkgs/by-name/op/opencloud/idp-web.nix @@ -2,6 +2,8 @@ stdenvNoCC, lib, opencloud, + applyPatches, + fetchpatch, pnpm_10, fetchPnpmDeps, pnpmConfigHook, @@ -10,7 +12,18 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "opencloud-idp-web"; - inherit (opencloud) version src; + inherit (opencloud) version; + + src = applyPatches { + src = opencloud.src; + patches = [ + # Fixes broken kopano tarball, remove in next version + (fetchpatch { + url = "https://github.com/opencloud-eu/opencloud/commit/212846f2f4e23e89ed675e5a689d87ba1de55b70.patch"; + hash = "sha256-i+fkWTY4nrZ5fVGlQhhamxy9yrBL9OtDdm7CfV13oak="; + }) + ]; + }; pnpmRoot = "services/idp"; @@ -18,8 +31,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { inherit (finalAttrs) pname version src; pnpm = pnpm_10; sourceRoot = "${finalAttrs.src.name}/${finalAttrs.pnpmRoot}"; - fetcherVersion = 1; - hash = "sha256-NW7HK2B9h5JprK3JcIGi/OHcyoa5VTs/P0s3BZr+4FU="; + fetcherVersion = 3; + hash = "sha256-W5odz//dONpBg4eRQQoVrBMVsEQVkkP89hzMdIXxG7w="; }; nativeBuildInputs = [ @@ -30,18 +43,22 @@ stdenvNoCC.mkDerivation (finalAttrs: { buildPhase = '' runHook preBuild + cd $pnpmRoot pnpm build mkdir -p assets/identifier/static cp -v src/images/favicon.svg assets/identifier/static/favicon.svg cp -v src/images/icon-lilac.svg assets/identifier/static/icon-lilac.svg + runHook postBuild ''; installPhase = '' runHook preInstall + mkdir $out cp -r assets $out + runHook postInstall '';