diff options
| author | Petr Rockai <me@mornfall.net> | 2014-01-31 13:17:37 +0100 |
|---|---|---|
| committer | Petr Rockai <me@mornfall.net> | 2014-01-31 13:18:06 +0100 |
| commit | cdac4b69c97d539e96b2b03e963c29f8b28376be (patch) | |
| tree | da549af066448d3df515c71f470e35774680b8c6 /pkgs/servers/dict | |
| parent | 0b499fb96350636ccb4be1c1416a8ac8a22eef63 (diff) | |
| download | nixpkgs-cdac4b69c97d539e96b2b03e963c29f8b28376be.tar nixpkgs-cdac4b69c97d539e96b2b03e963c29f8b28376be.tar.gz nixpkgs-cdac4b69c97d539e96b2b03e963c29f8b28376be.tar.bz2 nixpkgs-cdac4b69c97d539e96b2b03e963c29f8b28376be.tar.lz nixpkgs-cdac4b69c97d539e96b2b03e963c29f8b28376be.tar.xz nixpkgs-cdac4b69c97d539e96b2b03e963c29f8b28376be.tar.zst nixpkgs-cdac4b69c97d539e96b2b03e963c29f8b28376be.zip | |
Revert "Revert "dictd: Update to latest upstream (0.12.1)."" and add the
missing libmaa.nix. This reverts commit d59778678a23d72297a5dd813387d38c0448df3c.
Diffstat (limited to 'pkgs/servers/dict')
| -rw-r--r-- | pkgs/servers/dict/buildfix.diff | 11 | ||||
| -rw-r--r-- | pkgs/servers/dict/default.nix | 21 | ||||
| -rw-r--r-- | pkgs/servers/dict/libmaa.nix | 20 |
3 files changed, 43 insertions, 9 deletions
diff --git a/pkgs/servers/dict/buildfix.diff b/pkgs/servers/dict/buildfix.diff new file mode 100644 index 00000000000..e30fcb2b038 --- /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 51de674eb9f..1fb7c24418f 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; }; } diff --git a/pkgs/servers/dict/libmaa.nix b/pkgs/servers/dict/libmaa.nix new file mode 100644 index 00000000000..c63306e1ff4 --- /dev/null +++ b/pkgs/servers/dict/libmaa.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, libtool }: + +stdenv.mkDerivation rec { + version = "1.3.2"; + name = "libmaa-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/dict/libmaa-${version}.tar.gz"; + sha256 = "1idi4c30pi79g5qfl7rr9s17krbjbg93bi8f2qrbsdlh78ga19ar"; + }; + + buildInputs = [ libtool ]; + # configureFlags = "--datadir=/var/run/current-system/share/dictd"; + + meta = with stdenv.lib; { + description = "Dict protocol server and client"; + maintainers = maintainers.mornfall; + platforms = platforms.linux; + }; +} |