summary refs log tree commit diff
path: root/nixos/modules/services/web-apps/nextcloud.nix
diff options
context:
space:
mode:
authorWill Dietz <w@wdtz.org>2019-04-06 02:34:54 -0500
committerWill Dietz <w@wdtz.org>2019-04-06 10:34:14 -0500
commit27d78f4c6c094382d1807c06bf9c86a8bcb78052 (patch)
treed087e0baa0b0d568c7b97175d307e2580bd55ae6 /nixos/modules/services/web-apps/nextcloud.nix
parentc58c0792231739d754cae94313f5f4cdb5480cf8 (diff)
downloadnixpkgs-27d78f4c6c094382d1807c06bf9c86a8bcb78052.tar
nixpkgs-27d78f4c6c094382d1807c06bf9c86a8bcb78052.tar.gz
nixpkgs-27d78f4c6c094382d1807c06bf9c86a8bcb78052.tar.bz2
nixpkgs-27d78f4c6c094382d1807c06bf9c86a8bcb78052.tar.lz
nixpkgs-27d78f4c6c094382d1807c06bf9c86a8bcb78052.tar.xz
nixpkgs-27d78f4c6c094382d1807c06bf9c86a8bcb78052.tar.zst
nixpkgs-27d78f4c6c094382d1807c06bf9c86a8bcb78052.zip
nextcloud: use same php package throughout!
`phpPackage` is 7.3 by default, but `pkgs.php` is 7.2,
so this saves the need for an extra copy of php
for the purpose of running nextcloud's cron;
more importantly this fixes problems with extensions
not loading since they are built against a different php.
Diffstat (limited to 'nixos/modules/services/web-apps/nextcloud.nix')
-rw-r--r--nixos/modules/services/web-apps/nextcloud.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix
index eedcccac723..d0e45e1c12a 100644
--- a/nixos/modules/services/web-apps/nextcloud.nix
+++ b/nixos/modules/services/web-apps/nextcloud.nix
@@ -32,7 +32,7 @@ let
     cd ${pkgs.nextcloud}
     exec /run/wrappers/bin/sudo -u nextcloud \
       NEXTCLOUD_CONFIG_DIR="${cfg.home}/config" \
-      ${config.services.phpfpm.phpPackage}/bin/php \
+      ${phpPackage}/bin/php \
       -c ${pkgs.writeText "php.ini" phpOptionsStr}\
       occ $*
   '';
@@ -360,7 +360,7 @@ in {
           environment.NEXTCLOUD_CONFIG_DIR = "${cfg.home}/config";
           serviceConfig.Type = "oneshot";
           serviceConfig.User = "nextcloud";
-          serviceConfig.ExecStart = "${pkgs.php}/bin/php -f ${pkgs.nextcloud}/cron.php";
+          serviceConfig.ExecStart = "${phpPackage}/bin/php -f ${pkgs.nextcloud}/cron.php";
         };
       };