diff options
author | Peter Hoeg | 2020-07-29 00:12:20 +0800 |
---|---|---|
committer | GitHub | 2020-07-28 18:12:20 +0200 |
commit | 1340776965ec0caebc17d42fcab2744abcc24dc2 (patch) | |
tree | d65356e5b59d2102ad781e5cfe0860a8af7476af /pkgs | |
parent | 302aed5ab4e0362c701e0d44d4cf35dfe7da4965 (diff) |
dict: look for config in /etc (#94050)
Previously it was impossible to configure dict/dictd system-wide as it was looking for a config file in the nix store. Instead use /etc so it becomes usable.
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/servers/dict/default.nix | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/pkgs/servers/dict/default.nix b/pkgs/servers/dict/default.nix index fbffecbafafe..5e4d625c187b 100644 --- a/pkgs/servers/dict/default.nix +++ b/pkgs/servers/dict/default.nix @@ -13,23 +13,26 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ bison flex libtool which ]; - # Makefile(.in) contains "clientparse.c clientparse.h: clientparse.y" which - # causes bison to run twice, and break the build when this happens in - # parallel. Test with "make -j clientparse.c clientparse.h". The error - # message may be "mv: cannot move 'y.tab.c' to 'clientparse.c'". - enableParallelBuilding = false; + # In earlier versions, parallel building was not supported but it's OK with 1.13 + enableParallelBuilding = true; patchPhase = "patch -p0 < ${./buildfix.diff}"; + configureFlags = [ "--enable-dictorg" "--datadir=/run/current-system/sw/share/dictd" + "--sysconfdir=/etc" ]; + postInstall = '' + install -Dm444 -t $out/share/doc/${pname} NEWS README + ''; + meta = with stdenv.lib; { description = "Dict protocol server and client"; - homepage = "http://www.dict.org"; - license = licenses.gpl2; + homepage = "http://www.dict.org"; + license = licenses.gpl2; maintainers = with maintainers; [ ]; - platforms = platforms.linux; + platforms = platforms.linux; }; } |