cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #193281 from uninsane/pr/whalebird-4.6.5

Browse source
This commit is contained in:
Sandro 2022-09-29 11:43:59 +02:00 committed by GitHub
commit 0f81cd747d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/applications/misc/whalebird/default.nix
View file

@ -3,7 +3,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "whalebird"; pname = "whalebird";
version = "4.6.0"; version = "4.6.5";
src = let src = let
downloads = "https://github.com/h3poteto/whalebird-desktop/releases/download/${version}"; downloads = "https://github.com/h3poteto/whalebird-desktop/releases/download/${version}";
@ -11,12 +11,12 @@ stdenv.mkDerivation rec {
if stdenv.system == "x86_64-linux" then if stdenv.system == "x86_64-linux" then
fetchurl { fetchurl {
url = downloads + "/Whalebird-${version}-linux-x64.tar.bz2"; url = downloads + "/Whalebird-${version}-linux-x64.tar.bz2";
sha256 = "02f2f4b7184494926ef58523174acfa23738d5f27b4956d094836a485047c2f8"; sha256 = "sha256-WeZnWEwRbZEnYkLwWf6EC3ZbwI+Cr59czdKxxG/Lhn0=";
} }
else if stdenv.system == "aarch64-linux" then else if stdenv.system == "aarch64-linux" then
fetchurl { fetchurl {
url = downloads + "/Whalebird-${version}-linux-arm64.tar.bz2"; url = downloads + "/Whalebird-${version}-linux-arm64.tar.bz2";
sha256 = "de0cdf7cbd6f0305100a2440e2559ddce0a5e4ad73a341874d6774e23dc76974"; sha256 = "sha256-5iKVP7zOci5X+EhnfJx5cZ5RiqZKz1pFLDUwZncynUc=";
} }
else else
throw "Whalebird is not supported for ${stdenv.system}"; throw "Whalebird is not supported for ${stdenv.system}";
@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
# Necessary steps to find the tray icon # Necessary steps to find the tray icon
asar extract opt/Whalebird/resources/app.asar "$TMP/work" asar extract opt/Whalebird/resources/app.asar "$TMP/work"
substituteInPlace $TMP/work/dist/electron/main.js \ 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 asar pack --unpack='{*.node,*.ftz,rect-overlay}' "$TMP/work" opt/Whalebird/resources/app.asar
runHook postBuild runHook postBuild

4
pkgs/top-level/all-packages.nix
View file

@ -32280,7 +32280,9 @@ with pkgs;
weston = callPackage ../applications/window-managers/weston { }; 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 { wio = callPackage ../applications/window-managers/wio {
wlroots = wlroots_0_14; wlroots = wlroots_0_14;