1 files changed, 47 insertions, 38 deletions
diff --git a/nixpkgs/pkgs/tools/filesystems/netatalk/default.nix b/nixpkgs/pkgs/tools/filesystems/netatalk/default.nix
index f5eb62cca56e..a4e1b6d62c4d 100644
--- a/nixpkgs/pkgs/tools/filesystems/netatalk/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/netatalk/default.nix
@@ -1,67 +1,76 @@
-{ fetchurl, lib, stdenv, autoreconfHook, pkg-config, perl, python3
-, db, libgcrypt, avahi, libiconv, pam, openssl, acl
-, ed, libtirpc, libevent, fetchpatch
+{ lib
+, stdenv
+, fetchurl
+, fetchpatch
+, acl
+, autoreconfHook
+, avahi
+, db
+, ed
+, libevent
+, libgcrypt
+, libiconv
+, libtirpc
+, openssl
+, pam
+, perl
+, pkg-config
+, python3
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "netatalk";
-  version = "3.1.13";
+  version = "3.1.15";
 
   src = fetchurl {
-    url = "mirror://sourceforge/netatalk/netatalk/netatalk-${version}.tar.bz2";
-    sha256 = "0pg0slvvvq3l6f5yjz9ybijg4i6rs5a6c8wcynaasf8vzsyadbc9";
+    url = "mirror://sourceforge/netatalk/netatalk/netatalk-${finalAttrs.version}.tar.bz2";
+    hash = "sha256-2NSlzA/Yaw2Q4BfWTB9GI+jNv72lcPxCOt4RUak9GfU=";
   };
 
   patches = [
-    ./no-suid.patch
-    ./omitLocalstatedirCreation.patch
-    (fetchpatch {
-      name = "make-afpstats-python3-compatible.patch";
-      url = "https://github.com/Netatalk/Netatalk/commit/916b515705cf7ba28dc53d13202811c6e1fe6a9e.patch";
-      sha256 = "sha256-DAABpYjQPJLsQBhmtP30gA357w0Qn+AsnFgAeyDC/Rg=";
-    })
+    ./000-no-suid.patch
+    ./001-omit-localstatedir-creation.patch
   ];
 
-  nativeBuildInputs = [ autoreconfHook pkg-config perl python3 python3.pkgs.wrapPython ];
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+    perl
+    python3
+    python3.pkgs.wrapPython
+  ];
 
-  buildInputs = [ db libgcrypt avahi libiconv pam openssl acl libevent ];
+  buildInputs = [
+    acl
+    avahi
+    db
+    libevent
+    libgcrypt
+    libiconv
+    openssl
+    pam
+  ];
 
   configureFlags = [
     "--with-bdb=${db.dev}"
     "--with-ssl-dir=${openssl.dev}"
     "--with-lockfile=/run/lock/netatalk"
-    "--with-libevent=${libevent.dev}"
     "--localstatedir=/var/lib"
   ];
 
-  # Expose librpcsvc to the linker for afpd
-  # Fixes errors that showed up when closure-size was merged:
-  # afpd-nfsquota.o: In function `callaurpc':
-  # netatalk-3.1.7/etc/afpd/nfsquota.c:78: undefined reference to `xdr_getquota_args'
-  # netatalk-3.1.7/etc/afpd/nfsquota.c:78: undefined reference to `xdr_getquota_rslt'
-  postConfigure = ''
-    ${ed}/bin/ed -v etc/afpd/Makefile << EOF
-    /^afpd_LDADD
-    /am__append_2
-    a
-      ${libtirpc}/lib/libtirpc.so \\
-    .
-    w
-    EOF
-  '';
-
   postInstall = ''
+    sed -i -e "s%/usr/bin/env python%${python3}/bin/python3%" $out/bin/afpstats
     buildPythonPath ${python3.pkgs.dbus-python}
     patchPythonScript $out/bin/afpstats
   '';
 
   enableParallelBuilding = true;
 
-  meta = {
+  meta = with lib; {
     description = "Apple Filing Protocol Server";
     homepage = "http://netatalk.sourceforge.net/";
-    license = lib.licenses.gpl3;
-    platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ jcumming ];
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ jcumming ];
   };
-}
+})