From 93df0d6b308a821cfd3a433364f441224f48f0f4 Mon Sep 17 00:00:00 2001 From: PapayaJackal <145766029+PapayaJackal@users.noreply.github.com> Date: Sun, 20 Oct 2024 11:24:23 +0000 Subject: [PATCH 1/4] maintainers: add PapayaJackal --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 8679b63bd0b6..6ab3b77e8d4c 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -16303,6 +16303,11 @@ githubId = 33182938; name = "Pankaj"; }; + PapayaJackal = { + github = "PapayaJackal"; + githubId = 145766029; + name = "PapayaJackal"; + }; paperdigits = { email = "mica@silentumbrella.com"; github = "paperdigits"; From 33283c8e665b2ddf9184f5a3f53358015dd28485 Mon Sep 17 00:00:00 2001 From: PapayaJackal <145766029+PapayaJackal@users.noreply.github.com> Date: Sun, 20 Oct 2024 13:29:48 +0000 Subject: [PATCH 2/4] coyim: add maintainer --- pkgs/by-name/co/coyim/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/co/coyim/package.nix b/pkgs/by-name/co/coyim/package.nix index b45522006890..06eac7b7786d 100644 --- a/pkgs/by-name/co/coyim/package.nix +++ b/pkgs/by-name/co/coyim/package.nix @@ -35,5 +35,6 @@ buildGoModule { license = lib.licenses.gpl3; platforms = [ "x86_64-linux" "x86_64-darwin" ]; broken = stdenv.hostPlatform.isDarwin; + maintainers = with lib.maintainers; [ PapayaJackal ]; }; } From 877334ef365a950747056e0c520e26b66be3bb79 Mon Sep 17 00:00:00 2001 From: PapayaJackal <145766029+PapayaJackal@users.noreply.github.com> Date: Sun, 20 Oct 2024 13:30:38 +0000 Subject: [PATCH 3/4] coyim: nixfmt --- pkgs/by-name/co/coyim/package.nix | 41 ++++++++++++++++++++----------- 1 file changed, 27 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/co/coyim/package.nix b/pkgs/by-name/co/coyim/package.nix index 06eac7b7786d..60da34d0f2ac 100644 --- a/pkgs/by-name/co/coyim/package.nix +++ b/pkgs/by-name/co/coyim/package.nix @@ -1,14 +1,15 @@ -{ lib -, stdenv -, buildGoModule -, fetchFromGitHub -, pkg-config -, cairo -, gdk-pixbuf -, glib -, adwaita-icon-theme -, wrapGAppsHook3 -, gtk3 +{ + lib, + stdenv, + buildGoModule, + fetchFromGitHub, + pkg-config, + cairo, + gdk-pixbuf, + glib, + adwaita-icon-theme, + wrapGAppsHook3, + gtk3, }: buildGoModule { @@ -24,16 +25,28 @@ buildGoModule { vendorHash = "sha256-zG7r/Db6XiwKoHRduGj3tEh/KT1hsuBoSGLYaZ+qO0Y="; - nativeBuildInputs = [ pkg-config wrapGAppsHook3 ]; + nativeBuildInputs = [ + pkg-config + wrapGAppsHook3 + ]; - buildInputs = [ glib cairo gdk-pixbuf gtk3 adwaita-icon-theme ]; + buildInputs = [ + glib + cairo + gdk-pixbuf + gtk3 + adwaita-icon-theme + ]; meta = { description = "Safe and secure chat client"; mainProgram = "coyim"; homepage = "https://coy.im/"; license = lib.licenses.gpl3; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; + platforms = [ + "x86_64-linux" + "x86_64-darwin" + ]; broken = stdenv.hostPlatform.isDarwin; maintainers = with lib.maintainers; [ PapayaJackal ]; }; From 200961e8f28974b89bdb218139e1bc3e4395b5d5 Mon Sep 17 00:00:00 2001 From: PapayaJackal <145766029+PapayaJackal@users.noreply.github.com> Date: Sun, 20 Oct 2024 17:11:32 +0000 Subject: [PATCH 4/4] coyim: fix build on aarch64 --- pkgs/by-name/co/coyim/package.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/co/coyim/package.nix b/pkgs/by-name/co/coyim/package.nix index 60da34d0f2ac..182aef00b98e 100644 --- a/pkgs/by-name/co/coyim/package.nix +++ b/pkgs/by-name/co/coyim/package.nix @@ -38,15 +38,16 @@ buildGoModule { adwaita-icon-theme ]; + postPatch = '' + # fixes build on aarch64 + rm -v windows_amd64_icon.syso + ''; + meta = { description = "Safe and secure chat client"; mainProgram = "coyim"; homepage = "https://coy.im/"; license = lib.licenses.gpl3; - platforms = [ - "x86_64-linux" - "x86_64-darwin" - ]; broken = stdenv.hostPlatform.isDarwin; maintainers = with lib.maintainers; [ PapayaJackal ]; };