From 58e2807066fc66923904fbeacecb3e9d9b2ecc33 Mon Sep 17 00:00:00 2001 From: Timon Schelling Date: Fri, 25 Apr 2025 13:03:58 +0000 Subject: [PATCH 1/3] beeper: fix post extract commands --- pkgs/by-name/be/beeper/package.nix | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/be/beeper/package.nix b/pkgs/by-name/be/beeper/package.nix index eba68ca2380e..0dc6a9ddf55e 100644 --- a/pkgs/by-name/be/beeper/package.nix +++ b/pkgs/by-name/be/beeper/package.nix @@ -15,20 +15,22 @@ let hash = "sha256-K043RQ5BoS1ysnmY+LpRixBmMx2XCbRzhWnWsxg26dg="; }; appimageContents = appimageTools.extract { - inherit version pname src; + inherit pname version src; + + postExtract = '' + # disable creating a desktop file and icon in the home folder during runtime + linuxConfigFilename=$out/resources/app/build/main/linux-*.mjs + echo "export function registerLinuxConfig() {}" > $linuxConfigFilename + ''; }; in -appimageTools.wrapType2 { - inherit pname version src; +appimageTools.wrapAppImage { + inherit pname version; + + src = appimageContents; extraPkgs = pkgs: [ pkgs.libsecret ]; - postExtract = '' - # disable creating a desktop file and icon in the home folder during runtime - linuxConfigFilename=$out/resources/app/build/main/linux-*.mjs - echo "export function registerLinuxConfig() {}" > $linuxConfigFilename - ''; - extraInstallCommands = '' install -Dm 644 ${appimageContents}/beepertexts.png $out/share/icons/hicolor/512x512/apps/beepertexts.png install -Dm 644 ${appimageContents}/beepertexts.desktop -t $out/share/applications/ @@ -50,10 +52,13 @@ appimageTools.wrapType2 { text = '' set -o errexit latestLinux="$(curl --silent --output /dev/null --write-out "%{redirect_url}\n" https://api.beeper.com/desktop/download/linux/x64/stable/com.automattic.beeper.desktop)" - version="$(echo "$latestLinux" | grep --only-matching --extended-regexp '[0-9]+\.[0-9]+\.[0-9]+')" + version="$(echo "$latestLinux" | grep --only-matching --extended-regexp '[0-9]+\.[0-9]+\.[0-9]+')" update-source-version beeper "$version" ''; }); + + # needed for nix-update + inherit src; }; meta = with lib; { From fe374f94efbd58aa593b5dd84b1fae29fa1ad3fd Mon Sep 17 00:00:00 2001 From: Timon Schelling Date: Fri, 25 Apr 2025 13:05:07 +0000 Subject: [PATCH 2/3] beeper: disable auto update and prevent updates (#401086) --- pkgs/by-name/be/beeper/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/be/beeper/package.nix b/pkgs/by-name/be/beeper/package.nix index 0dc6a9ddf55e..53ca924fd665 100644 --- a/pkgs/by-name/be/beeper/package.nix +++ b/pkgs/by-name/be/beeper/package.nix @@ -21,6 +21,12 @@ let # disable creating a desktop file and icon in the home folder during runtime linuxConfigFilename=$out/resources/app/build/main/linux-*.mjs echo "export function registerLinuxConfig() {}" > $linuxConfigFilename + + # disable auto update + sed -i 's/[^=]*\.auto_update_disabled/true/' $out/resources/app/build/main/main-entry-*.mjs + + # prevent updates + sed -i -E 's/executeDownload\([^)]+\)\{/executeDownload(){return;/g' $out/resources/app/build/main/main-entry-*.mjs ''; }; in From 55dfbf42869a1965260dbc3af15d9464d2acb8ad Mon Sep 17 00:00:00 2001 From: Timon Schelling Date: Fri, 25 Apr 2025 14:12:14 +0000 Subject: [PATCH 3/3] beeper: hide version status element --- pkgs/by-name/be/beeper/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/be/beeper/package.nix b/pkgs/by-name/be/beeper/package.nix index 53ca924fd665..7dd82a6802e4 100644 --- a/pkgs/by-name/be/beeper/package.nix +++ b/pkgs/by-name/be/beeper/package.nix @@ -27,6 +27,9 @@ let # prevent updates sed -i -E 's/executeDownload\([^)]+\)\{/executeDownload(){return;/g' $out/resources/app/build/main/main-entry-*.mjs + + # hide version status element on about page otherwise a error message is shown + sed -i '$ a\.subview-prefs-about > div:nth-child(2) {display: none;}' $out/resources/app/build/renderer/PrefsPanes-*.css ''; }; in