public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dict: look for config in /etc (#94050)

Browse Source 
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.
This commit is contained in:
Peter Hoeg 2020-07-29 00:12:20 +08:00 committed by GitHub
parent 302aed5ab4
commit 1340776965
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/servers/dict/default.nix
View File

@ -13,23 +13,26 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ bison flex libtool which ]; nativeBuildInputs = [ bison flex libtool which ];
# Makefile(.in) contains "clientparse.c clientparse.h: clientparse.y" which # In earlier versions, parallel building was not supported but it's OK with 1.13
# causes bison to run twice, and break the build when this happens in enableParallelBuilding = true;
# 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;
patchPhase = "patch -p0 < ${./buildfix.diff}"; patchPhase = "patch -p0 < ${./buildfix.diff}";
configureFlags = [ configureFlags = [
"--enable-dictorg" "--enable-dictorg"
"--datadir=/run/current-system/sw/share/dictd" "--datadir=/run/current-system/sw/share/dictd"
"--sysconfdir=/etc"
]; ];
postInstall = ''
install -Dm444 -t $out/share/doc/${pname} NEWS README
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Dict protocol server and client"; description = "Dict protocol server and client";
homepage = "http://www.dict.org"; homepage = "http://www.dict.org";
license = licenses.gpl2; license = licenses.gpl2;
maintainers = with maintainers; [ ]; maintainers = with maintainers; [ ];
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }