From d95a29a01aa5ca83b51221eb77d0aeb488fca970 Mon Sep 17 00:00:00 2001 From: obadz Date: Fri, 2 Sep 2016 19:38:03 +0100 Subject: [PATCH] netatalk: fix build (broken since closure-size) Helps with #18209 --- pkgs/tools/filesystems/netatalk/default.nix | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/filesystems/netatalk/default.nix b/pkgs/tools/filesystems/netatalk/default.nix index f842b8ae13381..0214afce6d456 100644 --- a/pkgs/tools/filesystems/netatalk/default.nix +++ b/pkgs/tools/filesystems/netatalk/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, db, libgcrypt, avahi, libiconv, pam, openssl, acl }: +{ fetchurl, stdenv, pkgconfig, db, libgcrypt, avahi, libiconv, pam, openssl, acl, ed, glibc }: stdenv.mkDerivation rec{ name = "netatalk-3.1.7"; @@ -19,6 +19,22 @@ stdenv.mkDerivation rec{ "--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 + ${glibc.static}/lib/librpcsvc.a \\ + . + w + EOF + ''; + enableParallelBuilding = true; meta = {