diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-05-06 14:07:03 +0200 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-05-06 14:07:03 +0200 |
commit | f61d1c7cb908ab83cffe962cc73f1a86e692b6e5 (patch) | |
tree | 2b054346dc4aa7a1c0fa6b8edb6396cd7f9b1c9a /pkgs | |
parent | 2630a5e928cda673e8e5ed56e5ceb2e95d29dd0b (diff) | |
download | Nix-f61d1c7cb908ab83cffe962cc73f1a86e692b6e5.tar.gz Nix-f61d1c7cb908ab83cffe962cc73f1a86e692b6e5.tar.zst Nix-f61d1c7cb908ab83cffe962cc73f1a86e692b6e5.zip |
Rename davical config field to avoid clash
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/webapps/davical/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/webapps/davical/default.nix b/pkgs/webapps/davical/default.nix index fefc00f..52d8736 100644 --- a/pkgs/webapps/davical/default.nix +++ b/pkgs/webapps/davical/default.nix | |||
@@ -1,4 +1,4 @@ | |||
1 | { config ? "/etc/davical/config.php", stdenv, fetchurl, gettext }: | 1 | { davical_config ? "/etc/davical/config.php", stdenv, fetchurl, gettext }: |
2 | stdenv.mkDerivation rec { | 2 | stdenv.mkDerivation rec { |
3 | version = "1.1.7"; | 3 | version = "1.1.7"; |
4 | name = "davical-${version}"; | 4 | name = "davical-${version}"; |
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec { | |||
14 | installPhase = '' | 14 | installPhase = '' |
15 | mkdir -p $out | 15 | mkdir -p $out |
16 | cp -ra config dba docs htdocs inc locale po scripts testing zonedb $out | 16 | cp -ra config dba docs htdocs inc locale po scripts testing zonedb $out |
17 | ln -s ${config} $out/config/config.php | 17 | ln -s ${davical_config} $out/config/config.php |
18 | ''; | 18 | ''; |
19 | buildInputs = [ gettext ]; | 19 | buildInputs = [ gettext ]; |
20 | } | 20 | } |