mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-25 16:33:15 +00:00
Revert "dictd: Update to latest upstream (0.12.1)."
This reverts commit 8162222071
since it
breaks evaluation (libmaa.nix is missing).
This commit is contained in:
parent
287b22cc63
commit
d59778678a
@ -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
|
||||
|
@ -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;
|
||||
};
|
||||
}
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user