diff --git a/pkgs/servers/dict/buildfix.diff b/pkgs/servers/dict/buildfix.diff index e30fcb2b0380..a838a76f3c67 100644 --- a/pkgs/servers/dict/buildfix.diff +++ b/pkgs/servers/dict/buildfix.diff @@ -1,5 +1,5 @@ ---- Makefile.in~ 2011-03-06 18:52:54.000000000 +0100 -+++ Makefile.in 2014-01-29 19:04:51.384844897 +0100 +--- a/Makefile.in~ 2011-03-06 18:52:54.000000000 +0100 ++++ a/Makefile.in 2014-01-29 19:04:51.384844897 +0100 @@ -123,7 +123,7 @@ %: %.o diff --git a/pkgs/servers/dict/default.nix b/pkgs/servers/dict/default.nix index 547c12534e94..d3c74dfab9be 100644 --- a/pkgs/servers/dict/default.nix +++ b/pkgs/servers/dict/default.nix @@ -12,13 +12,17 @@ stdenv.mkDerivation rec { pname = "dictd"; - version = "1.13.1"; + version = "1.13.3"; src = fetchurl { url = "mirror://sourceforge/dict/dictd-${version}.tar.gz"; - sha256 = "sha256-5PGmfRaJTYSUVp19yUQsFcw4wBHyuWMcfxzGInZlKhs="; + hash = "sha256-GSEp37OPpyP0ipWGx5xRmPxJBP7BdXF2kXMU3Qc/EXE="; }; + patches = [ + ./buildfix.diff + ]; + buildInputs = [ libmaa zlib @@ -34,28 +38,20 @@ stdenv.mkDerivation rec { # In earlier versions, parallel building was not supported but it's OK with 1.13 enableParallelBuilding = true; - patchPhase = "patch -p0 < ${./buildfix.diff}"; - configureFlags = [ "--datadir=/run/current-system/sw/share/dictd" "--sysconfdir=/etc" ]; - env.NIX_CFLAGS_COMPILE = toString ( - lib.optionals stdenv.cc.isClang [ - "-Wno-error=implicit-function-declaration" - ] - ); - postInstall = '' install -Dm444 -t $out/share/doc/${pname} NEWS README ''; - meta = with lib; { + meta = { description = "Dict protocol server and client"; homepage = "http://www.dict.org"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ sikmir ]; - platforms = platforms.unix; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ sikmir ]; + platforms = lib.platforms.unix; }; }