colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

nixpatches: update Whalebird patch to upstream PR

Browse Source
This commit is contained in:
colin
2022-06-18 17:31:15 -07:00
parent a031beee18
commit 09d071dd53
1 changed files with 38 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
nixpatches/06-whalebird-4.6.0-aarch64.patch
View File

@@ -1,10 +1,28 @@
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 8240f18ce1b..87bba9e271b 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2523,6 +2523,13 @@
fingerprint = "68B8 0D57 B2E5 4AC3 EC1F 49B0 B37E 0F23 7101 6A4C";
}];
};
+ colinsane = {
+ name = "Colin Sane";
+ email = "colin@uninsane.org";
+ matrix = "@colin:uninsane.org";
+ github = "uninsane";
+ githubId = 106709944;
+ };
collares = {
email = "mauricio@collares.org";
github = "collares";
diff --git a/pkgs/applications/misc/whalebird/default.nix b/pkgs/applications/misc/whalebird/default.nix diff --git a/pkgs/applications/misc/whalebird/default.nix b/pkgs/applications/misc/whalebird/default.nix
index 9b8a7f0a348..122c0b84c83 100644 index 9b8a7f0a348..1689dbed51b 100644
--- a/pkgs/applications/misc/whalebird/default.nix --- a/pkgs/applications/misc/whalebird/default.nix
+++ b/pkgs/applications/misc/whalebird/default.nix +++ b/pkgs/applications/misc/whalebird/default.nix
@@ -1,17 +1,25 @@ @@ -1,28 +1,52 @@
-{ lib, stdenv, fetchurl, dpkg, autoPatchelfHook, makeWrapper, electron -{ lib, stdenv, fetchurl, dpkg, autoPatchelfHook, makeWrapper, electron
+{ lib, stdenv, fetchurl, autoPatchelfHook, makeDesktopItem, makeWrapper, electron +{ lib, stdenv, fetchurl, autoPatchelfHook, makeDesktopItem, copyDesktopItems, makeWrapper, electron
, nodePackages, alsa-lib, gtk3, libdbusmenu, libxshmfence, mesa, nss }: , nodePackages, alsa-lib, gtk3, libdbusmenu, libxshmfence, mesa, nss }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@@ -19,23 +37,27 @@ index 9b8a7f0a348..122c0b84c83 100644
+ src = let + src = let
+ downloads = "https://github.com/h3poteto/whalebird-desktop/releases/download/${version}"; + downloads = "https://github.com/h3poteto/whalebird-desktop/releases/download/${version}";
+ in + in
+ { + if stdenv.system == "x86_64-linux" then
+ x86_64-linux = fetchurl { + fetchurl {
+ url = downloads + "/Whalebird-${version}-linux-x64.tar.bz2"; + url = downloads + "/Whalebird-${version}-linux-x64.tar.bz2";
+ sha256 = "02f2f4b7184494926ef58523174acfa23738d5f27b4956d094836a485047c2f8"; + sha256 = "02f2f4b7184494926ef58523174acfa23738d5f27b4956d094836a485047c2f8";
+ }; + }
+ aarch64-linux = fetchurl { + else if stdenv.system == "aarch64-linux" then
+ fetchurl {
+ url = downloads + "/Whalebird-${version}-linux-arm64.tar.bz2"; + url = downloads + "/Whalebird-${version}-linux-arm64.tar.bz2";
+ sha256 = "de0cdf7cbd6f0305100a2440e2559ddce0a5e4ad73a341874d6774e23dc76974"; + sha256 = "de0cdf7cbd6f0305100a2440e2559ddce0a5e4ad73a341874d6774e23dc76974";
+ }; + }
+ }.${stdenv.system}; + else
+ throw "Whalebird is not supported for ${stdenv.system}"
+ ;
nativeBuildInputs = [ nativeBuildInputs = [
- dpkg - dpkg
autoPatchelfHook autoPatchelfHook
makeWrapper makeWrapper
+ copyDesktopItems
nodePackages.asar nodePackages.asar
@@ -19,10 +27,22 @@ stdenv.mkDerivation rec { ];
buildInputs = [ alsa-lib gtk3 libdbusmenu libxshmfence mesa nss ]; buildInputs = [ alsa-lib gtk3 libdbusmenu libxshmfence mesa nss ];
@@ -60,7 +82,7 @@ index 9b8a7f0a348..122c0b84c83 100644
''; '';
buildPhase = '' buildPhase = ''
@@ -31,7 +51,7 @@ stdenv.mkDerivation rec { @@ -31,7 +55,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 \
@@ -69,7 +91,7 @@ index 9b8a7f0a348..122c0b84c83 100644
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
@@ -41,12 +61,17 @@ stdenv.mkDerivation rec { @@ -41,12 +65,17 @@ stdenv.mkDerivation rec {
runHook preInstall runHook preInstall
mkdir $out mkdir $out
@@ -91,11 +113,13 @@ index 9b8a7f0a348..122c0b84c83 100644
runHook postInstall runHook postInstall
''; '';
@@ -56,6 +81,6 @@ stdenv.mkDerivation rec { @@ -55,7 +84,7 @@ stdenv.mkDerivation rec {
description = "Electron based Mastodon, Pleroma and Misskey client for Windows, Mac and Linux";
homepage = "https://whalebird.social"; homepage = "https://whalebird.social";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ wolfangaukang ]; - maintainers = with maintainers; [ wolfangaukang ];
- platforms = [ "x86_64-linux" ]; - platforms = [ "x86_64-linux" ];
+ maintainers = with maintainers; [ wolfangaukang colinsane ];
+ platforms = [ "x86_64-linux" "aarch64-linux" ]; + platforms = [ "x86_64-linux" "aarch64-linux" ];
}; };
} }