From 27a548c0322026a8d95a98297032584ee78a4e25 Mon Sep 17 00:00:00 2001
From: Artur Manuel <balkenix@outlook.com>
Date: Sat, 16 Nov 2024 00:31:36 +0000
Subject: [PATCH 1/2] maintainers: add amadaluzia

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 055857336729..5f35c9c8539b 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1197,6 +1197,12 @@
     name = "alyaeanyx";
     keys = [ { fingerprint = "1F73 8879 5E5A 3DFC E2B3 FA32 87D1 AADC D25B 8DEE"; } ];
   };
+  amadaluzia = {
+    email = "amad@atl.tools";
+    github = "amadaluzia";
+    githubId = 188314694;
+    name = "Artur Manuel";
+  };
   amadejkastelic = {
     email = "amadejkastelic7@gmail.com";
     github = "amadejkastelic";

From 903651eba2c5c5fbdfbdd58bda8bc87b5c938f95 Mon Sep 17 00:00:00 2001
From: Artur Manuel <balkenix@outlook.com>
Date: Sat, 16 Nov 2024 00:32:57 +0000
Subject: [PATCH 2/2] nicotine-plus: 3.3.5 -> 3.3.6

---
 pkgs/by-name/ni/nicotine-plus/package.nix | 61 ++++++++++++++---------
 1 file changed, 38 insertions(+), 23 deletions(-)

diff --git a/pkgs/by-name/ni/nicotine-plus/package.nix b/pkgs/by-name/ni/nicotine-plus/package.nix
index 460066b5de75..df2e532fb44d 100644
--- a/pkgs/by-name/ni/nicotine-plus/package.nix
+++ b/pkgs/by-name/ni/nicotine-plus/package.nix
@@ -1,45 +1,57 @@
-{ lib
-, fetchFromGitHub
-, wrapGAppsHook4
-, gdk-pixbuf
-, gettext
-, gobject-introspection
-, gtk4
-, python3Packages
+{
+  lib,
+  fetchFromGitHub,
+  wrapGAppsHook4,
+  gdk-pixbuf,
+  gettext,
+  gobject-introspection,
+  gtk4,
+  glib,
+  python3Packages,
+  libadwaita,
 }:
-
 python3Packages.buildPythonApplication rec {
   pname = "nicotine-plus";
-  version = "3.3.5";
-
+  version = "3.3.6";
+  pyproject = true;
   src = fetchFromGitHub {
     owner = "nicotine-plus";
     repo = "nicotine-plus";
     rev = "refs/tags/${version}";
-    hash = "sha256-6tA3d+QX2ArDH4aeWZNKuIXe3Sk32JaFe8d0C8G9Akc=";
+    hash = "sha256-je3hyxbF9wKW2gvHoDp712EJxBxooS2z0pQM57WDdOk=";
   };
 
-  nativeBuildInputs = [ gettext wrapGAppsHook4 gobject-introspection ];
-
-  propagatedBuildInputs = [
-    gdk-pixbuf
+  nativeBuildInputs = [
+    gettext
+    wrapGAppsHook4
     gobject-introspection
+    glib
+    gdk-pixbuf
     gtk4
+  ];
+
+  buildInputs = [
+    libadwaita
+  ];
+
+  dependencies = [
     python3Packages.pygobject3
   ];
 
+  build-system = [
+    python3Packages.setuptools
+  ];
+
   postInstall = ''
     ln -s $out/bin/nicotine $out/bin/nicotine-plus
   '';
 
-  preFixup = ''
-    gappsWrapperArgs+=(
-      --prefix XDG_DATA_DIRS : "${gtk4}/share/gsettings-schemas/${gtk4.name}"
-    )
-  '';
+  dontWrapGAppsHook = true;
+  makeWrapperArgs = [
+    "\${gappsWrapperArgs[@]}"
+  ];
 
   doCheck = false;
-
   meta = with lib; {
     description = "Graphical client for the SoulSeek peer-to-peer system";
     longDescription = ''
@@ -49,6 +61,9 @@ python3Packages.buildPythonApplication rec {
     '';
     homepage = "https://www.nicotine-plus.org";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ klntsky ];
+    maintainers = with maintainers; [
+      klntsky
+      amadaluzia
+    ];
   };
 }