From 5ecb2f292979c4fa46b783279fc8821d27af5f01 Mon Sep 17 00:00:00 2001
From: Eric Helgeson <erichelgeson@gmail.com>
Date: Mon, 31 Mar 2025 08:11:11 -0500
Subject: [PATCH] netatalk: 4.1.2 -> 4.2.0

---
 .../0000-no-install-under-usr-cupsd.patch     | 29 +++++++++++++++++++
 .../0001-no-install-under-var-CNID.patch      | 13 +++++++++
 pkgs/by-name/ne/netatalk/package.nix          | 16 +++++++---
 3 files changed, 54 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/by-name/ne/netatalk/0000-no-install-under-usr-cupsd.patch
 create mode 100644 pkgs/by-name/ne/netatalk/0001-no-install-under-var-CNID.patch

diff --git a/pkgs/by-name/ne/netatalk/0000-no-install-under-usr-cupsd.patch b/pkgs/by-name/ne/netatalk/0000-no-install-under-usr-cupsd.patch
new file mode 100644
index 000000000000..aa816565c03e
--- /dev/null
+++ b/pkgs/by-name/ne/netatalk/0000-no-install-under-usr-cupsd.patch
@@ -0,0 +1,29 @@
+diff --git a/config/meson.build b/config/meson.build
+index 4d750dba..f6bd6e6e 100644
+--- a/config/meson.build
++++ b/config/meson.build
+@@ -55,15 +55,15 @@ elif host_os in ['linux']
+     cups_libdir = '/usr/lib'
+ endif
+ 
+-if have_appletalk and have_cups and cups_libdir != ''
+-    configure_file(
+-        input: 'pap.in',
+-        output: 'pap',
+-        configuration: cdata,
+-        install: true,
+-        install_dir: cups_libdir / 'cups/backend',
+-    )
+-endif
++#if have_appletalk and have_cups and cups_libdir != ''
++#    configure_file(
++#        input: 'pap.in',
++#        output: 'pap',
++#        configuration: cdata,
++#        install: true,
++#        install_dir: cups_libdir / 'cups/backend',
++#    )
++#endif
+ 
+ foreach file : static_conf_files
+     if (
diff --git a/pkgs/by-name/ne/netatalk/0001-no-install-under-var-CNID.patch b/pkgs/by-name/ne/netatalk/0001-no-install-under-var-CNID.patch
new file mode 100644
index 000000000000..740756d89ad6
--- /dev/null
+++ b/pkgs/by-name/ne/netatalk/0001-no-install-under-var-CNID.patch
@@ -0,0 +1,13 @@
+diff --git a/config/meson.build b/config/meson.build
+index 4d750dba..111389e7 100644
+--- a/config/meson.build
++++ b/config/meson.build
+@@ -89,7 +89,7 @@ if (
+     )
+ endif
+ 
+-install_data('README', install_dir: localstatedir / 'netatalk/CNID')
++# install_data('README', install_dir: localstatedir / 'netatalk/CNID')
+ 
+ if have_pam
+     subdir('pam')
diff --git a/pkgs/by-name/ne/netatalk/package.nix b/pkgs/by-name/ne/netatalk/package.nix
index 9832c80527c5..0558aa9649af 100644
--- a/pkgs/by-name/ne/netatalk/package.nix
+++ b/pkgs/by-name/ne/netatalk/package.nix
@@ -23,18 +23,24 @@
   glib,
   dbus,
   docbook-xsl-nons,
-  libxslt,
+  cmark-gfm,
+  iniparser,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "netatalk";
-  version = "4.1.2";
+  version = "4.2.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/netatalk/netatalk/netatalk-${finalAttrs.version}.tar.xz";
-    hash = "sha256-qCX2/37+2wm7nKdXJ6tDEmeXAA+Jd123LI2VIL9IHpw=";
+    hash = "sha256-doqRAU4pjcHRTvKOvjMN2tSZKOPDTzBzU7i90xf1ClI=";
   };
 
+  patches = [
+    ./0000-no-install-under-usr-cupsd.patch
+    ./0001-no-install-under-var-CNID.patch
+  ];
+
   nativeBuildInputs = [
     pkg-config
     meson
@@ -59,11 +65,13 @@ stdenv.mkDerivation (finalAttrs: {
     perl
     dbus
     docbook-xsl-nons
-    libxslt
+    cmark-gfm
+    iniparser
   ];
 
   mesonFlags = [
     "-Dwith-appletalk=true"
+    "-Dwith-statedir-path=/var/lib"
     "-Dwith-bdb-path=${db.out}"
     "-Dwith-bdb-include-path=${db.dev}/include"
     "-Dwith-install-hooks=false"