From cd1bd15f510aa638411370e9311b1a722f175d65 Mon Sep 17 00:00:00 2001
From: jolheiser <john.olheiser@gmail.com>
Date: Thu, 14 Sep 2023 12:03:22 -0500
Subject: [PATCH] fix: prospect-mail back to original repo

Signed-off-by: jolheiser <john.olheiser@gmail.com>
---
 justfile                       |  3 ++-
 pkgs/prospect-mail/default.nix | 18 +++++++++---------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/justfile b/justfile
index f24e491..81cf27a 100644
--- a/justfile
+++ b/justfile
@@ -6,7 +6,8 @@ readme:
 	@nu -c 'nu README.nu | save --force README.md'
 
 build package:
-	@nix-build -E 'with import <nixpkgs> { }; callPackage ./pkgs/{{package}} { }'
+	@git add .
+	@nix build .#{{package}}
 
 update-flake:
 	@nix flake update
diff --git a/pkgs/prospect-mail/default.nix b/pkgs/prospect-mail/default.nix
index 657188f..b6321b9 100644
--- a/pkgs/prospect-mail/default.nix
+++ b/pkgs/prospect-mail/default.nix
@@ -5,7 +5,7 @@
   makeWrapper,
   makeDesktopItem,
   copyDesktopItems,
-  nodejs_18,
+  nodejs_20,
   fetchYarnDeps,
   fixup_yarn_lock,
   electron,
@@ -16,21 +16,21 @@
 }:
 stdenv.mkDerivation rec {
   pname = "prospect-mail";
-  version = "0.5.2";
+  version = "24e49ca0187884fa772a5928c56d7a9ed76441bd";
 
   src = fetchFromGitHub {
-    owner = "jolheiser";
+    owner = "julian-alarcon";
     repo = pname;
-    rev = "v${version}";
-    sha256 = "sha256-ptbxXYWwvalkC1PdCRUbtj23KrAv42HhUS6EUhLgjNY=";
+    rev = version;
+    sha256 = "sha256-taFVVExBKsE6GToiNWh8E0tVlx8qaWw5t8krydyiG24=";
   };
 
   offlineCache = fetchYarnDeps {
     yarnLock = "${src}/yarn.lock";
-    sha256 = "sha256-tenHW93GF9rQs9AyEv4Nkike0IAry3qI+geZ5LKbrgo=";
+    sha256 = "sha256-bWVJvhaEue47uXzQQg7OPI6bjVcbmWcacmBeXTc8A6c=";
   };
 
-  nativeBuildInputs = [nodejs_18.pkgs.yarn fixup_yarn_lock nodejs_18 copyDesktopItems makeWrapper];
+  nativeBuildInputs = [nodejs_20.pkgs.yarn fixup_yarn_lock nodejs_20 copyDesktopItems makeWrapper];
 
   configurePhase = ''
     runHook preConfigure
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
       then "--arm64"
       else "--x64"
     } \
-      -c.electronDist=${electron}/lib/electron \
+      -c.electronDist=${electron}/libexec/electron \
       -c.electronVersion=${electron.version}
 
     runHook postBuild
@@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
       else "linux-"
     }${lib.optionalString stdenv.hostPlatform.isAarch64 "arm64-"}unpacked/resources/app.asar $out/share/prospect-mail/
 
-    pushd build/icons
+    pushd build
     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