diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2022-09-29 11:43:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-29 11:43:59 +0200 |
| commit | 0f81cd747d92979012058257f8b0b6fa64cc4a94 (patch) | |
| tree | 0389e613a1a8fa60f843c53f33d4ba9922a69f30 | |
| parent | 6867c18a9efdfcb89f62249a5efa1b1825db22aa (diff) | |
| parent | b1571315968abf863ca7de7bd7b6500805f69d6c (diff) | |
Merge pull request #193281 from uninsane/pr/whalebird-4.6.5
| -rw-r--r-- | pkgs/applications/misc/whalebird/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/applications/misc/whalebird/default.nix b/pkgs/applications/misc/whalebird/default.nix index 3972d7a17230..b42fbe12ffeb 100644 --- a/pkgs/applications/misc/whalebird/default.nix +++ b/pkgs/applications/misc/whalebird/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { pname = "whalebird"; - version = "4.6.0"; + version = "4.6.5"; src = let downloads = "https://github.com/h3poteto/whalebird-desktop/releases/download/${version}"; @@ -11,12 +11,12 @@ stdenv.mkDerivation rec { if stdenv.system == "x86_64-linux" then fetchurl { url = downloads + "/Whalebird-${version}-linux-x64.tar.bz2"; - sha256 = "02f2f4b7184494926ef58523174acfa23738d5f27b4956d094836a485047c2f8"; + sha256 = "sha256-WeZnWEwRbZEnYkLwWf6EC3ZbwI+Cr59czdKxxG/Lhn0="; } else if stdenv.system == "aarch64-linux" then fetchurl { url = downloads + "/Whalebird-${version}-linux-arm64.tar.bz2"; - sha256 = "de0cdf7cbd6f0305100a2440e2559ddce0a5e4ad73a341874d6774e23dc76974"; + sha256 = "sha256-5iKVP7zOci5X+EhnfJx5cZ5RiqZKz1pFLDUwZncynUc="; } else throw "Whalebird is not supported for ${stdenv.system}"; @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { # Necessary steps to find the tray icon asar extract opt/Whalebird/resources/app.asar "$TMP/work" substituteInPlace $TMP/work/dist/electron/main.js \ - --replace "Do,\"tray_icon.png\"" "\"$out/opt/Whalebird/resources/build/icons/tray_icon.png\"" + --replace "Ao,\"tray_icon.png\"" "\"$out/opt/Whalebird/resources/build/icons/tray_icon.png\"" asar pack --unpack='{*.node,*.ftz,rect-overlay}' "$TMP/work" opt/Whalebird/resources/app.asar runHook postBuild diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 690a39c11faa..99350d88ed97 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32280,7 +32280,9 @@ with pkgs; weston = callPackage ../applications/window-managers/weston { }; - whalebird = callPackage ../applications/misc/whalebird { }; + whalebird = callPackage ../applications/misc/whalebird { + electron = electron_19; + }; wio = callPackage ../applications/window-managers/wio { wlroots = wlroots_0_14; |