Revert "Revert "dictd: Update to latest upstream (0.12.1)."" and add the

missing libmaa.nix.

This reverts commit d59778678a.
This commit is contained in:
Petr Rockai 2014-01-31 13:17:37 +01:00
parent 0b499fb963
commit cdac4b69c9
4 changed files with 46 additions and 10 deletions

View File

@ -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

View File

@ -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;
};
}

View File

@ -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;
};
}

View File

@ -6107,7 +6107,9 @@ let
dico = callPackage ../servers/dico { };
dict = callPackage ../servers/dict { };
dict = callPackage ../servers/dict {
libmaa = callPackage ../servers/dict/libmaa.nix {};
};
dictdDBs = recurseIntoAttrs (import ../servers/dict/dictd-db.nix {
inherit builderDefs;