diff --git a/justfile b/justfile
index 81cf27a977315a124629e56a90125bf86034d544..f24e4918a431e8c7cffa5cb828c0fc962a663d9c 100644
--- a/justfile
+++ b/justfile
@@ -6,8 +6,7 @@ readme:
 	@nu -c 'nu README.nu | save --force README.md'
 
 build package:
-	@git add .
-	@nix build .#{{package}}
+	@nix-build -E 'with import <nixpkgs> { }; callPackage ./pkgs/{{package}} { }'
 
 update-flake:
 	@nix flake update
diff --git a/pkgs/prospect-mail/default.nix b/pkgs/prospect-mail/default.nix
index b6321b9cad8758288124d4d10f0790fc77b0ece3..657188f6e8f4f5c59ab69478f86f2de0d506cace 100644
--- a/pkgs/prospect-mail/default.nix
+++ b/pkgs/prospect-mail/default.nix
@@ -5,7 +5,7 @@   fetchFromGitHub,
   makeWrapper,
   makeDesktopItem,
   copyDesktopItems,
-  nodejs_20,
+  nodejs_18,
   fetchYarnDeps,
   fixup_yarn_lock,
   electron,
@@ -16,24 +16,24 @@   which,
 }:
 stdenv.mkDerivation rec {
   pname = "prospect-mail";
-{
   fetchYarnDeps,
+  stdenv,
 
   src = fetchFromGitHub {
-    owner = "julian-alarcon";
+    owner = "jolheiser";
     repo = pname;
-    rev = version;
-  lib,
+  fetchYarnDeps,
   makeWrapper,
+    sha256 = "sha256-ptbxXYWwvalkC1PdCRUbtj23KrAv42HhUS6EUhLgjNY=";
   };
 
   offlineCache = fetchYarnDeps {
     yarnLock = "${src}/yarn.lock";
-  lib,
   fetchYarnDeps,
+  copyDesktopItems,
   };
 
-  nativeBuildInputs = [nodejs_20.pkgs.yarn fixup_yarn_lock nodejs_20 copyDesktopItems makeWrapper];
+  nativeBuildInputs = [nodejs_18.pkgs.yarn fixup_yarn_lock nodejs_18 copyDesktopItems makeWrapper];
 
   configurePhase = ''
     runHook preConfigure
@@ -60,7 +60,7 @@       if stdenv.hostPlatform.isAarch64
       then "--arm64"
       else "--x64"
     } \
-      -c.electronDist=${electron}/libexec/electron \
+      -c.electronDist=${electron}/lib/electron \
       -c.electronVersion=${electron.version}
 
     runHook postBuild
@@ -76,7 +76,7 @@       then "darwin-"
       else "linux-"
     }${lib.optionalString stdenv.hostPlatform.isAarch64 "arm64-"}unpacked/resources/app.asar $out/share/prospect-mail/
 
-    pushd build
+    pushd build/icons
     for image in *png; do
       mkdir -p $out/share/icons/hicolor/''${image%.png}/apps
       cp -r $image $out/share/icons/hicolor/''${image%.png}/apps/prospect-mail.png