diff --git a/pkgs/by-name/vi/vikunja-desktop/package.nix b/pkgs/by-name/vi/vikunja-desktop/package.nix index 0fb49af8482120..95a855362e0dcb 100644 --- a/pkgs/by-name/vi/vikunja-desktop/package.nix +++ b/pkgs/by-name/vi/vikunja-desktop/package.nix @@ -3,13 +3,11 @@ stdenv, makeWrapper, makeDesktopItem, - callPackage, pnpm, nodejs, electron, unstableGitUpdater, fetchFromGitHub, - fetchzip, vikunja, }: @@ -29,6 +27,7 @@ stdenv.mkDerivation (finalAttrs: { inherit version src; sourceRoot = "${finalAttrs.src.name}/desktop"; + pnpmInstallFlags = [ "--shamefully-hoist" ]; pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) @@ -36,6 +35,7 @@ stdenv.mkDerivation (finalAttrs: { version src sourceRoot + pnpmInstallFlags ; hash = "sha256-5kBQS2nW9VqbWB+Kqe6+/gEPmB5Fj3n7zu2De4Q5GZ0="; }; @@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { sed -i "s/\$${version}/${version}/g" package.json sed -i "s/\"version\": \".*\"/\"version\": \"${version}\"/" package.json - + ln -s '${vikunja.passthru.frontend}' frontend pnpm run pack -c.electronDist="${electron.dist}" -c.electronVersion="${electron.version}" runHook postBuild @@ -70,7 +70,6 @@ stdenv.mkDerivation (finalAttrs: { mkdir -p "$out/share/lib/vikunja-desktop" cp -r ./dist/*-unpacked/{locales,resources{,.pak}} "$out/share/lib/vikunja-desktop" cp -r ./node_modules "$out/share/lib/vikunja-desktop/resources" - ln -s '${vikunja.passthru.frontend}' "$out/share/lib/vikunja-desktop/resources/frontend" install -Dm644 "build/icon.png" "$out/share/icons/hicolor/256x256/apps/vikunja-desktop.png"