Add piedsjaloux to pkgs

1 files changed, 11 insertions, 10 deletions

diff --git a/nixops/modules/websites/piedsjaloux/default.nix b/nixops/modules/websites/piedsjaloux/default.nix
index 9f9697d..2a1271b 100644
--- a/nixops/modules/websites/piedsjaloux/default.nix
+++ b/nixops/modules/websites/piedsjaloux/default.nix
@@ -1,14 +1,15 @@
 { lib, pkgs, config, myconfig, mylibs, ... }:
 let
-    piedsjaloux = pkgs.callPackage ./piedsjaloux.nix { inherit (mylibs) fetchedGitPrivate; };
-    piedsjaloux_dev  = piedsjaloux {
-      config = myconfig.env.websites.piedsjaloux.integration;
-    };
-    piedsjaloux_prod = piedsjaloux {
-      config = myconfig.env.websites.piedsjaloux.production;
-    };
+  piedsjaloux_dev  = pkgs.callPackage ./piedsjaloux.nix {
+    inherit (pkgs.private.webapps) piedsjaloux;
+    config = myconfig.env.websites.piedsjaloux.integration;
+  };
+  piedsjaloux_prod = pkgs.callPackage ./piedsjaloux.nix {
+    inherit (pkgs.private.webapps) piedsjaloux;
+    config = myconfig.env.websites.piedsjaloux.production;
+  };
 
-    cfg = config.services.myWebsites.PiedsJaloux;
+  cfg = config.services.myWebsites.PiedsJaloux;
 in {
   options.services.myWebsites.PiedsJaloux = {
     production = {
@@ -37,7 +38,7 @@ in {
       system.activationScripts.piedsjaloux_prod = piedsjaloux_prod.activationScript;
       system.extraSystemBuilderCmds = ''
         mkdir -p $out/webapps
-        ln -s ${piedsjaloux_prod.webRoot} $out/webapps/${piedsjaloux_prod.apache.webappName}
+        ln -s ${piedsjaloux_prod.app.webRoot} $out/webapps/${piedsjaloux_prod.apache.webappName}
         '';
       services.myWebsites.production.modules = piedsjaloux_prod.apache.modules;
       services.myWebsites.production.vhostConfs.piedsjaloux = {
@@ -56,7 +57,7 @@ in {
       system.activationScripts.piedsjaloux_dev = piedsjaloux_dev.activationScript;
       system.extraSystemBuilderCmds = ''
         mkdir -p $out/webapps
-        ln -s ${piedsjaloux_dev.webRoot} $out/webapps/${piedsjaloux_dev.apache.webappName}
+        ln -s ${piedsjaloux_dev.app.webRoot} $out/webapps/${piedsjaloux_dev.apache.webappName}
         '';
       services.myWebsites.integration.modules = piedsjaloux_dev.apache.modules;
       services.myWebsites.integration.vhostConfs.piedsjaloux = {