diff options
| author | Jordan Mulcahey <snhjordy@gmail.com> | 2015-08-13 22:05:03 -0700 |
|---|---|---|
| committer | Emery Hemingway <emery@vfemail.net> | 2016-02-24 19:32:54 +0100 |
| commit | a2b8cc0aaf74f4a98b820925f96a33123fbcd1c4 (patch) | |
| tree | ed244297c0994437c5992b223a75cd071aede1eb /pkgs/tools/filesystems/netatalk | |
| parent | e3aa635e68ca3cae0676229324cd7f04c0818601 (diff) | |
netatalk: 3.1.0 -> 3.1.7, new service module
Diffstat (limited to 'pkgs/tools/filesystems/netatalk')
| -rw-r--r-- | pkgs/tools/filesystems/netatalk/default.nix | 16 | ||||
| -rw-r--r-- | pkgs/tools/filesystems/netatalk/omitLocalstatedirCreation.patch | 35 |
2 files changed, 45 insertions, 6 deletions
diff --git a/pkgs/tools/filesystems/netatalk/default.nix b/pkgs/tools/filesystems/netatalk/default.nix index d5a0cbbc4190..7e4ea032bb39 100644 --- a/pkgs/tools/filesystems/netatalk/default.nix +++ b/pkgs/tools/filesystems/netatalk/default.nix @@ -1,24 +1,28 @@ -{ fetchurl, stdenv, pkgconfig, db, libgcrypt, avahi, libiconv, pam, openssl }: +{ fetchurl, stdenv, pkgconfig, db, libgcrypt, avahi, libiconv, pam, openssl, acl }: -stdenv.mkDerivation rec { - name = "netatalk-3.1.0"; +stdenv.mkDerivation rec{ + name = "netatalk-3.1.7"; src = fetchurl { url = "mirror://sourceforge/netatalk/netatalk/${name}.tar.bz2"; - sha256 = "1d8dc8ysslkis4yl1xab1w9p0pz7a1kg0i6fds4wxsp4fhb6wqhq"; + sha256 = "0wf09fyqzza024qr1s26z5x7rsvh9zb4pv598gw7gm77wjcr6174"; }; - buildInputs = [ pkgconfig db libgcrypt avahi pam openssl libiconv ]; + buildInputs = [ pkgconfig db libgcrypt avahi libiconv pam openssl acl ]; + + patches = ./omitLocalstatedirCreation.patch; configureFlags = [ "--with-bdb=${db}" "--with-openssl=${openssl}" + "--with-lockfile=/run/lock/netatalk" + "--localstatedir=/var/lib" ]; enableParallelBuild = true; meta = { - description = "Apple File Protocl Server"; + description = "Apple Filing Protocol Server"; homepage = http://netatalk.sourceforge.net/; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/filesystems/netatalk/omitLocalstatedirCreation.patch b/pkgs/tools/filesystems/netatalk/omitLocalstatedirCreation.patch new file mode 100644 index 000000000000..d1a9dcb0b3bf --- /dev/null +++ b/pkgs/tools/filesystems/netatalk/omitLocalstatedirCreation.patch @@ -0,0 +1,35 @@ +diff -ur netatalk-3.1.7-old/config/Makefile.in netatalk-3.1.7-new/config/Makefile.in +--- netatalk-3.1.7-old/config/Makefile.in 2014-08-29 03:33:35.000000000 -0700 ++++ netatalk-3.1.7-new/config/Makefile.in 2015-08-13 20:52:35.000000000 -0700 +@@ -699,7 +699,7 @@ + + info-am: + +-install-data-am: install-data-local install-dbusserviceDATA ++install-data-am: install-dbusserviceDATA + + install-dvi: install-dvi-recursive + +@@ -754,7 +754,7 @@ + cscopelist cscopelist-recursive ctags ctags-recursive \ + distclean distclean-generic distclean-libtool distclean-tags \ + distdir dvi dvi-am html html-am info info-am install \ +- install-am install-data install-data-am install-data-local \ ++ install-am install-data install-data-am \ + install-dbusserviceDATA install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ +@@ -782,12 +782,6 @@ + # install configuration files + # + +-install-data-local: install-config-files +- mkdir -pm 0755 $(DESTDIR)$(localstatedir)/netatalk/ +- mkdir -pm 0755 $(DESTDIR)$(localstatedir)/netatalk/CNID/ +- $(INSTALL_DATA) $(srcdir)/README $(DESTDIR)$(localstatedir)/netatalk/ +- $(INSTALL_DATA) $(srcdir)/README $(DESTDIR)$(localstatedir)/netatalk/CNID/ +- + uninstall-local: + @for f in $(CONFFILES) $(GENFILES); do \ + echo rm -f $(DESTDIR)$(pkgconfdir)/$$f; \ + |