diff options
| author | Petr Rockai <me@mornfall.net> | 2014-01-29 18:49:44 +0100 |
|---|---|---|
| committer | Petr Rockai <me@mornfall.net> | 2014-01-29 22:13:32 +0100 |
| commit | 81622220713ca0871362703bc9e8c69ba5996e0e (patch) | |
| tree | e63e4b959de0c4686fd135088c03158182ce993d /pkgs/servers/dict | |
| parent | 83acdb6f8727290e7199a08cc22a05582932c989 (diff) | |
dictd: Update to latest upstream (0.12.1).
Diffstat (limited to 'pkgs/servers/dict')
| -rw-r--r-- | pkgs/servers/dict/buildfix.diff | 11 | ||||
| -rw-r--r-- | pkgs/servers/dict/default.nix | 21 |
2 files changed, 23 insertions, 9 deletions
diff --git a/pkgs/servers/dict/buildfix.diff b/pkgs/servers/dict/buildfix.diff new file mode 100644 index 000000000000..e30fcb2b0380 --- /dev/null +++ b/pkgs/servers/dict/buildfix.diff @@ -0,0 +1,11 @@ +--- Makefile.in~ 2011-03-06 18:52:54.000000000 +0100 ++++ Makefile.in 2014-01-29 19:04:51.384844897 +0100 +@@ -123,7 +123,7 @@ + + %: %.o + $(LIBTOOL) --tag=CC --mode=link $(CC) -o $@ -static \ +- $^ $(OBJS) $(LDFLAGS) -lz ${LIBS} ++ $(^:.o=.lo) $(OBJS) $(LDFLAGS) -lz ${LIBS} + + include $(srcdir)/deps + diff --git a/pkgs/servers/dict/default.nix b/pkgs/servers/dict/default.nix index 51de674eb9f7..1fb7c24418f0 100644 --- a/pkgs/servers/dict/default.nix +++ b/pkgs/servers/dict/default.nix @@ -1,19 +1,22 @@ -{ stdenv, fetchurl, which, bison, flex }: +{ stdenv, fetchurl, which, bison, flex, libmaa, zlib, libtool }: -stdenv.mkDerivation { - name = "dictd-1.9.15"; +stdenv.mkDerivation rec { + version = "1.12.1"; + name = "dictd-${version}"; src = fetchurl { - url = mirror://sourceforge/dict/dictd-1.9.15.tar.gz; - sha256 = "0p41yf72l0igmshz6vxy3hm51z25600vrnb9j2jpgws4c03fqnac"; + url = "mirror://sourceforge/dict/dictd-${version}.tar.gz"; + sha256 = "0min6v60b6z5mrymyjfwzx8nv6rdm8pd8phlwl6v2jl5vkngcdx2"; }; - buildInputs = [ flex bison which ]; - + buildInputs = [ flex bison which libmaa zlib libtool ]; + + patchPhase = "patch -p0 < ${./buildfix.diff}"; configureFlags = "--datadir=/var/run/current-system/share/dictd"; - meta = { + meta = with stdenv.lib; { description = "Dict protocol server and client"; - maintainers = with stdenv.lib.maintainers; mornfall; + maintainers = maintainers.mornfall; + platforms = platforms.linux; }; } |