From 0b2e86386fc22fbc0f612a914ecf9d820c3a3b22 Mon Sep 17 00:00:00 2001 From: Radoslaw Sniezek Date: Mon, 18 Mar 2024 10:30:15 +0100 Subject: [PATCH 1/2] maintainers: add rsniezek Adding myself as a maintainer so that I can add myself in packages I work on. --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 9dca180063e3..008d5052e6ea 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -16817,6 +16817,12 @@ github = "rski"; githubId = 2960312; }; + rsniezek = { + email = "radoslaw.sniezek@protonmail.com"; + github = "rsniezek"; + githubId = 19433256; + name = "Radoslaw Sniezek"; + }; rsynnest = { email = "contact@rsynnest.com"; github = "rsynnest"; From 2d76120d0cbce879cb330790ceb24c7ac91117ab Mon Sep 17 00:00:00 2001 From: Radoslaw Sniezek Date: Mon, 18 Mar 2024 10:29:29 +0100 Subject: [PATCH 2/2] protonmail-desktop: init at 1.0.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add package for proton mail desktop app in the beta version. Apply suggestions from code review Apply batch of suggestions from CR by @dotlambda. Co-authored-by: Robert Schütz --- .../by-name/pr/protonmail-desktop/package.nix | 52 +++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 pkgs/by-name/pr/protonmail-desktop/package.nix diff --git a/pkgs/by-name/pr/protonmail-desktop/package.nix b/pkgs/by-name/pr/protonmail-desktop/package.nix new file mode 100644 index 000000000000..b3edfaa9dc21 --- /dev/null +++ b/pkgs/by-name/pr/protonmail-desktop/package.nix @@ -0,0 +1,52 @@ +{ lib +, stdenv +, fetchurl +, makeWrapper +, dpkg +, electron +}: + +let + mainProgram = "proton-mail"; +in stdenv.mkDerivation rec { + pname = "protonmail-desktop"; + version = "1.0.1"; + + src = fetchurl { + url = "https://github.com/ProtonMail/inbox-desktop/releases/download/v${version}/proton-mail_${version}_amd64.deb"; + hash = "sha256-fNK//x3DOsynWSkG9N+nZ3wjYoC+RreaYVC6KEDXh4w="; + }; + + dontConfigure = true; + dontBuild = true; + + nativeBuildInputs = [ dpkg makeWrapper ]; + + installPhase = '' + runHook preInstall + mkdir -p $out + cp -r usr/share/ $out/ + cp -r usr/lib/proton-mail/resources/app.asar $out/share/ + runHook postInstall + ''; + + preFixup = '' + makeWrapper ${lib.getExe electron} $out/bin/${mainProgram} \ + --add-flags $out/share/app.asar \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --set-default ELECTRON_FORCE_IS_PACKAGED 1 \ + --set-default ELECTRON_IS_DEV 0 \ + --inherit-argv0 + ''; + + meta = with lib; { + description = "Desktop application for Mail and Calendar, made with Electron"; + homepage = "https://github.com/ProtonMail/inbox-desktop"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ rsniezek sebtm ]; + platforms = [ "x86_64-linux" ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + inherit mainProgram; + }; +} +