2 files changed, 46 insertions, 0 deletions

diff --git a/pkgs/webapps/davical/davical_19eb79ebf9250e5f339675319902458c40ed1755.patch b/pkgs/webapps/davical/davical_19eb79ebf9250e5f339675319902458c40ed1755.patch
new file mode 100644
index 00000000..2a08a5c1
--- /dev/null
+++ b/pkgs/webapps/davical/davical_19eb79ebf9250e5f339675319902458c40ed1755.patch
@@ -0,0 +1,26 @@
+diff --git a/inc/ui/collection-edit.php b/inc/ui/collection-edit.php
+index 3af9edd3b8c4ad9074113273175098841af6a28e..8c1d84012b035f7bc7faedcb24916581a02a5d3e 100644
+--- a/inc/ui/collection-edit.php
++++ b/inc/ui/collection-edit.php
+@@ -190,7 +190,7 @@ $privilege_xlate = array(
+ * @param dbrow $row The row object we read from the database.
+ * @return string The formatted privileges.
+ */
+-function collection_privilege_format_function( $value, $column, $row ) {
++function collection_privilege_format_function( $value, $column = NULL, $row = NULL ) {
+   global $privilege_xlate;
+ 
+   $privs = bits_to_privilege($value, 'calendar');
+diff --git a/inc/ui/principal-edit.php b/inc/ui/principal-edit.php
+index 20dee7fa4ca2235ff2f74be0dfb52cbe937ef822..2e37cd596b597bcce1e59d7c02a1c5fc2a7f88ce 100644
+--- a/inc/ui/principal-edit.php
++++ b/inc/ui/principal-edit.php
+@@ -454,7 +454,7 @@ EOTEMPLATE;
+ * @param dbrow $row The row object we read from the database.
+ * @return string The formatted privileges.
+ */
+-function principal_privilege_format_function( $value, $column, $row ) {
++function principal_privilege_format_function( $value, $column = NULL, $row = NULL ) {
+   global $privilege_xlate;
+ 
+   $privs = bits_to_privilege($value,'*');
diff --git a/pkgs/webapps/davical/default.nix b/pkgs/webapps/davical/default.nix
new file mode 100644
index 00000000..52d87366
--- /dev/null
+++ b/pkgs/webapps/davical/default.nix
@@ -0,0 +1,20 @@
+{ davical_config ? "/etc/davical/config.php", stdenv, fetchurl, gettext }:
+stdenv.mkDerivation rec {
+  version = "1.1.7";
+  name = "davical-${version}";
+  src = fetchurl {
+    url = "https://www.davical.org/downloads/davical_${version}.orig.tar.xz";
+    sha256 = "1ar5m2dxr92b204wkdi8z33ir9vz2jbh5k1p74icpv9ywifvjjp9";
+  };
+  unpackCmd = ''
+    tar --one-top-level -xf $curSrc
+  '';
+  makeFlags = "all";
+  patches = [ ./davical_19eb79ebf9250e5f339675319902458c40ed1755.patch ];
+  installPhase = ''
+    mkdir -p $out
+    cp -ra config dba docs htdocs inc locale po scripts testing zonedb $out
+    ln -s ${davical_config} $out/config/config.php
+  '';
+  buildInputs = [ gettext ];
+}