X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=pkgs%2Fwebapps%2Fnextcloud%2Fdefault.nix;h=1df483a98b4495361f68fd8f415ec15ce5ed9d4e;hb=1ddb9a44244de690ff604708ccbd3ec996cf2f02;hp=3d5e1144dce4651ac87ee51e5345cda3004cfe2f;hpb=c4216ddb8bedd0b75149c039bd5dc86c3d6a9b7f;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/pkgs/webapps/nextcloud/default.nix b/pkgs/webapps/nextcloud/default.nix
index 3d5e114..1df483a 100644
--- a/pkgs/webapps/nextcloud/default.nix
+++ b/pkgs/webapps/nextcloud/default.nix
@@ -1,20 +1,21 @@
-{ varDir ? "/var/lib/nextcloud", nextcloudVersion ? 18, otherConfig ? {}, lib, stdenv, callPackage, fetchurl }:
+{ varDir ? "/var/lib/nextcloud", nextcloudVersion ? 18, otherConfig ? {}, lib, stdenv, callPackage, fetchzip, fetchurl }:
 let
   appNames = [
-    "apporder" "audioplayer" "bookmarks" "calendar" "carnet" "contacts"
-    "cookbook" "deck" "extract" "files_markdown" "files_readmemd"
-    "flowupload" "gpxedit" "gpxpod" "keeweb" "maps" "metadata" "music"
-    "notes" "ocsms" "passman" "polls" "spreed" "tasks"
+    "apporder" "audioplayer" "bookmarks" "calendar" "carnet" "circles"
+    "contacts" "cookbook" "deck" "extract" "files_markdown"
+    "files_readmemd" "flowupload" "gpxedit" "gpxpod" "keeweb" "maps"
+    "metadata" "music" "notes" "ocsms" "passman" "polls" "spreed"
+    "social" "tasks"
   ];
   allApps = lib.attrsets.genAttrs appNames
     (name: callPackage (./apps + "/${name}.nix") { inherit buildApp nextcloudVersion; });
-  buildApp = { appName, version, url, sha256, otherConfig ? {}, installPhase ? "mkdir -p $out && cp -R . $out/" }:
+  buildApp = { appName, version, url, sha256, zip ? false, otherConfig ? {}, installPhase ? "mkdir -p $out && cp -R . $out/" }:
     stdenv.mkDerivation rec {
       name = "nextcloud-app-${appName}-${version}";
       inherit version;
       phases = "unpackPhase installPhase";
       inherit installPhase;
-      src = fetchurl { inherit url sha256; };
+      src = (if zip then fetchzip else fetchurl) { inherit url sha256; };
       passthru = {
         inherit appName otherConfig;
       };
@@ -52,7 +53,8 @@ let
       mkdir -p $out/
       cp -R . $out/
       rm -r $out/config
-      ln -sf ${varDir}/config $out/config
+      '' + lib.optionalString (varDir != null) ''
+        ln -sf ${varDir}/config $out/config
       '';
 
     passthru = toPassthru package [] otherConfig;