diff options
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/servers/dict/buildfix.diff | 11 | ||||
| -rw-r--r-- | pkgs/servers/dict/default.nix | 21 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
3 files changed, 10 insertions, 26 deletions
diff --git a/pkgs/servers/dict/buildfix.diff b/pkgs/servers/dict/buildfix.diff deleted file mode 100644 index e30fcb2b03802..0000000000000 --- a/pkgs/servers/dict/buildfix.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 1fb7c24418f0b..51de674eb9f72 100644 --- a/pkgs/servers/dict/default.nix +++ b/pkgs/servers/dict/default.nix @@ -1,22 +1,19 @@ -{ stdenv, fetchurl, which, bison, flex, libmaa, zlib, libtool }: +{ stdenv, fetchurl, which, bison, flex }: -stdenv.mkDerivation rec { - version = "1.12.1"; - name = "dictd-${version}"; +stdenv.mkDerivation { + name = "dictd-1.9.15"; src = fetchurl { - url = "mirror://sourceforge/dict/dictd-${version}.tar.gz"; - sha256 = "0min6v60b6z5mrymyjfwzx8nv6rdm8pd8phlwl6v2jl5vkngcdx2"; + url = mirror://sourceforge/dict/dictd-1.9.15.tar.gz; + sha256 = "0p41yf72l0igmshz6vxy3hm51z25600vrnb9j2jpgws4c03fqnac"; }; - buildInputs = [ flex bison which libmaa zlib libtool ]; - - patchPhase = "patch -p0 < ${./buildfix.diff}"; + buildInputs = [ flex bison which ]; + configureFlags = "--datadir=/var/run/current-system/share/dictd"; - meta = with stdenv.lib; { + meta = { description = "Dict protocol server and client"; - maintainers = maintainers.mornfall; - platforms = platforms.linux; + maintainers = with stdenv.lib.maintainers; mornfall; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b1fb47c9be750..9187a6f0aad0b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6107,9 +6107,7 @@ let dico = callPackage ../servers/dico { }; - dict = callPackage ../servers/dict { - libmaa = callPackage ../servers/dict/libmaa.nix {}; - }; + dict = callPackage ../servers/dict { }; dictdDBs = recurseIntoAttrs (import ../servers/dict/dictd-db.nix { inherit builderDefs; |