102 lines
3.6 KiB
Diff
102 lines
3.6 KiB
Diff
diff --git a/pkgs/applications/misc/whalebird/default.nix b/pkgs/applications/misc/whalebird/default.nix
|
|
index 9b8a7f0a348..122c0b84c83 100644
|
|
--- a/pkgs/applications/misc/whalebird/default.nix
|
|
+++ b/pkgs/applications/misc/whalebird/default.nix
|
|
@@ -1,17 +1,25 @@
|
|
-{ lib, stdenv, fetchurl, dpkg, autoPatchelfHook, makeWrapper, electron
|
|
+{ lib, stdenv, fetchurl, autoPatchelfHook, makeDesktopItem, makeWrapper, electron
|
|
, nodePackages, alsa-lib, gtk3, libdbusmenu, libxshmfence, mesa, nss }:
|
|
|
|
stdenv.mkDerivation rec {
|
|
pname = "whalebird";
|
|
- version = "4.5.4";
|
|
+ version = "4.6.0";
|
|
|
|
- src = fetchurl {
|
|
- url = "https://github.com/h3poteto/whalebird-desktop/releases/download/${version}/Whalebird-${version}-linux-x64.deb";
|
|
- sha256 = "048c2hpnlzjli8r1lcm7hd32qfsq4p9vkimrgc049yw9f15ndjpr";
|
|
- };
|
|
+ src = let
|
|
+ downloads = "https://github.com/h3poteto/whalebird-desktop/releases/download/${version}";
|
|
+ in
|
|
+ {
|
|
+ x86_64-linux = fetchurl {
|
|
+ url = downloads + "/Whalebird-${version}-linux-x64.tar.bz2";
|
|
+ sha256 = "02f2f4b7184494926ef58523174acfa23738d5f27b4956d094836a485047c2f8";
|
|
+ };
|
|
+ aarch64-linux = fetchurl {
|
|
+ url = downloads + "/Whalebird-${version}-linux-arm64.tar.bz2";
|
|
+ sha256 = "de0cdf7cbd6f0305100a2440e2559ddce0a5e4ad73a341874d6774e23dc76974";
|
|
+ };
|
|
+ }.${stdenv.system};
|
|
|
|
nativeBuildInputs = [
|
|
- dpkg
|
|
autoPatchelfHook
|
|
makeWrapper
|
|
nodePackages.asar
|
|
@@ -19,10 +27,22 @@ stdenv.mkDerivation rec {
|
|
|
|
buildInputs = [ alsa-lib gtk3 libdbusmenu libxshmfence mesa nss ];
|
|
|
|
- dontConfigure = true;
|
|
+ desktopItems = [
|
|
+ (makeDesktopItem {
|
|
+ desktopName = "Whalebird";
|
|
+ comment = meta.description;
|
|
+ categories = [ "Network" ];
|
|
+ exec = "whalebird";
|
|
+ icon = "whalebird";
|
|
+ name = "whalebird";
|
|
+ })
|
|
+ ];
|
|
|
|
unpackPhase = ''
|
|
- dpkg-deb -x ${src} ./
|
|
+ mkdir -p opt
|
|
+ tar -xf ${src} -C opt
|
|
+ # remove the version/target suffix from the untar'd directory
|
|
+ mv opt/Whalebird-* opt/Whalebird
|
|
'';
|
|
|
|
buildPhase = ''
|
|
@@ -31,7 +51,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 "jo,\"tray_icon.png\"" "\"$out/opt/Whalebird/resources/build/icons/tray_icon.png\""
|
|
+ --replace "Do,\"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
|
|
@@ -41,12 +61,17 @@ stdenv.mkDerivation rec {
|
|
runHook preInstall
|
|
|
|
mkdir $out
|
|
- mv usr/share opt $out
|
|
+ mv opt $out
|
|
+
|
|
+ # install icons
|
|
+ for icon in $out/opt/Whalebird/resources/build/icons/*.png; do
|
|
+ mkdir -p "$out/share/icons/hicolor/$(basename $icon .png)/apps"
|
|
+ ln -s "$icon" "$out/share/icons/hicolor/$(basename $icon .png)/apps/whalebird.png"
|
|
+ done
|
|
|
|
- substituteInPlace $out/share/applications/whalebird.desktop \
|
|
- --replace '/opt/Whalebird' $out/bin
|
|
makeWrapper ${electron}/bin/electron $out/bin/whalebird \
|
|
- --add-flags $out/opt/Whalebird/resources/app.asar
|
|
+ --add-flags $out/opt/Whalebird/resources/app.asar \
|
|
+ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}"
|
|
|
|
runHook postInstall
|
|
'';
|
|
@@ -56,6 +81,6 @@ stdenv.mkDerivation rec {
|
|
homepage = "https://whalebird.social";
|
|
license = licenses.mit;
|
|
maintainers = with maintainers; [ wolfangaukang ];
|
|
- platforms = [ "x86_64-linux" ];
|
|
+ platforms = [ "x86_64-linux" "aarch64-linux" ];
|
|
};
|
|
}
|