1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
|
diff --git a/pkgs/prospect-mail/default.nix b/pkgs/prospect-mail/default.nix
index 657188f6e8f4f5c59ab69478f86f2de0d506cace..b6321b9cad8758288124d4d10f0790fc77b0ece3 100644
--- a/pkgs/prospect-mail/default.nix
+++ b/pkgs/prospect-mail/default.nix
@@ -5,7 +5,7 @@ fetchFromGitHub,
makeWrapper,
makeDesktopItem,
copyDesktopItems,
- nodejs_18,
+ nodejs_20,
fetchYarnDeps,
fixup_yarn_lock,
electron,
@@ -16,21 +16,21 @@ which,
}:
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 @@ if stdenv.hostPlatform.isAarch64
then "--arm64"
else "--x64"
} \
- -c.electronDist=${electron}/lib/electron \
+ -c.electronDist=${electron}/libexec/electron \
-c.electronVersion=${electron.version}
runHook postBuild
@@ -73,7 +73,7 @@ then "darwin-"
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
|