gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

protonmail-desktop: restored darwin support (#448039)

Browse Source
This commit is contained in:
Matteo Pacini
2025-10-03 08:44:21 +00:00
committed by GitHub
parent 33cda418a6 b790574dd4
commit fbd00fbf8f
2 changed files with 51 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/by-name/pr/protonmail-desktop/package.nix
+39 -14
View File
@@ -6,32 +6,50 @@
makeWrapper,
dpkg,
electron,
_7zz,
}:
let
mainProgram = "proton-mail";
version = "1.9.1";
linuxHash = "sha256-P2i/uX++F1JUgwSUyndYazjLSCK1mP+XSGICPUoo1VE=";
darwinHash = "sha256-U+I0ttToDiLLjEaKlvdb7HhE4dMrLryc251GXBVsQEM=";
in
stdenv.mkDerivation {
pname = "protonmail-desktop";
inherit version;
src = fetchurl {
url = "https://proton.me/download/mail/linux/${version}/ProtonMail-desktop-beta.deb";
hash = "sha256-P2i/uX++F1JUgwSUyndYazjLSCK1mP+XSGICPUoo1VE=";
};
src =
{
"x86_64-linux" = fetchurl {
url = "https://proton.me/download/mail/linux/${version}/ProtonMail-desktop-beta.deb";
hash = linuxHash;
};
"aarch64-darwin" = fetchurl {
url = "https://proton.me/download/mail/macos/${version}/ProtonMail-desktop.dmg";
hash = darwinHash;
};
"x86_64-darwin" = fetchurl {
url = "https://proton.me/download/mail/macos/${version}/ProtonMail-desktop.dmg";
hash = darwinHash;
};
}
."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
dontConfigure = true;
dontBuild = true;
nativeBuildInputs = [
dpkg
makeWrapper
asar
];
nativeBuildInputs =
lib.optionals stdenv.hostPlatform.isLinux [
dpkg
makeWrapper
asar
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
_7zz
];
# Rebuild the ASAR archive, hardcoding the resourcesPath
preInstall = ''
preInstall = lib.optionalString stdenv.hostPlatform.isLinux ''
asar extract usr/lib/proton-mail/resources/app.asar tmp
rm usr/lib/proton-mail/resources/app.asar
substituteInPlace tmp/.webpack/main/index.js \
@@ -42,11 +60,17 @@ stdenv.mkDerivation {
installPhase = ''
runHook preInstall
''
+ lib.optionalString stdenv.hostPlatform.isLinux ''
mkdir -p $out/share/proton-mail
cp -r usr/share/ $out/
cp -r usr/lib/proton-mail/resources/* $out/share/proton-mail/
''
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
mkdir -p $out/Applications
cp -r "Proton Mail.app" $out/Applications/
''
+ ''
runHook postInstall
'';
@@ -72,7 +96,8 @@ stdenv.mkDerivation {
];
platforms = [
"x86_64-linux"
];
]
++ lib.platforms.darwin;
sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
inherit mainProgram;
pkgs/by-name/pr/protonmail-desktop/update.sh
+12 -4
View File
@@ -1,11 +1,19 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p common-updater-scripts jq
#!nix-shell -i bash -p coreutils jq
# shellcheck disable=SC1008
set -eu -o pipefail
cd "$(dirname "${BASH_SOURCE[0]}")"
latestVersion=$(curl https://proton.me/download/mail/linux/version.json | jq -r 'first(.Releases[])|.Version')
downloadUrl="https://proton.me/download/mail/linux/${latestVersion}/ProtonMail-desktop-beta.deb"
latestSha=$(nix store prefetch-file "$downloadUrl" --json | jq -r '.hash')
update-source-version "protonmail-desktop" "$latestVersion" "$latestSha" --ignore-same-version --file=./pkgs/by-name/pr/protonmail-desktop/package.nix
linuxDownloadUrl="https://proton.me/download/mail/linux/${latestVersion}/ProtonMail-desktop-beta.deb"
darwinDownloadUrl="https://proton.me/download/mail/macos/${latestVersion}/ProtonMail-desktop.dmg"
latestLinuxSha=$(nix store prefetch-file "$linuxDownloadUrl" --json | jq -r '.hash')
latestDarwinSha=$(nix store prefetch-file "$darwinDownloadUrl" --json | jq -r '.hash')
sed -i "s|version = \".*\";|version = \"${latestVersion}\";|" ./package.nix
sed -i "s|linuxHash = \"sha256-[^\"]*\";|linuxHash = \"${latestLinuxSha}\";|" ./package.nix
sed -i "s|darwinHash = \"sha256-[^\"]*\";|darwinHash = \"${latestDarwinSha}\";|" ./package.nix