summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hoeg <peter@hoeg.com>2020-07-28 10:24:48 +0800
committerPeter Hoeg <peter@hoeg.com>2020-07-28 10:24:48 +0800
commit81a82aa5bcffefe2b592bc820ef9cc065b510c1e (patch)
treefd9014e4def30b70a0fdcceb1a41a3f2f927feab
parentpantheon: more build fixes by using older vala (diff)
downloadnixpkgs-origin/f/dict.tar.gz
dict: look for config in /etcorigin/f/dict
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.
-rw-r--r--pkgs/servers/dict/default.nix19
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;
};
}