From f61d1c7cb908ab83cffe962cc73f1a86e692b6e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= <ismael.bouya@normalesup.org>
Date: Mon, 6 May 2019 14:07:03 +0200
Subject: Rename davical config field to avoid clash

---
 pkgs/webapps/davical/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs')

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 @@
-{ config ? "/etc/davical/config.php", stdenv, fetchurl, gettext }:
+{ davical_config ? "/etc/davical/config.php", stdenv, fetchurl, gettext }:
 stdenv.mkDerivation rec {
   version = "1.1.7";
   name = "davical-${version}";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   installPhase = ''
     mkdir -p $out
     cp -ra config dba docs htdocs inc locale po scripts testing zonedb $out
-    ln -s ${config} $out/config/config.php
+    ln -s ${davical_config} $out/config/config.php
   '';
   buildInputs = [ gettext ];
 }
-- 
cgit v1.2.3