Merge pull request #95 from schneider-felix/devenv-1.x

Devenv 1.x
kellerkinderDE · Apr 9, 2024 · 7141799 · 7141799
2 parents 757eb95 + fd67aeb
commit 7141799
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/modules/caddy.nix b/modules/caddy.nix
@@ -83,6 +83,7 @@ in {
       config = ''
         {
           auto_https disable_redirects
+          skip_install_trust
         }
       '';
       virtualHosts = caddyHostConfig;

diff --git a/modules/php.nix b/modules/php.nix
@@ -36,7 +36,7 @@ let
   ];
 
   phpVersion = if builtins.hasAttr "PHP_VERSION" config.env then config.env.PHP_VERSION else cfg.phpVersion;
-  package = inputs.phps.packages.${builtins.currentSystem}.${phpVersion};
+  package = inputs.phps.packages.${pkgs.stdenv.system}.${phpVersion};
 
   phpPackage = package.buildEnv {
     extensions = { all, enabled }: with all; enabled

diff --git a/modules/scripts.nix b/modules/scripts.nix
@@ -23,7 +23,7 @@ let
       ${pkgs.wait4x}/bin/wait4x http http://localhost:9200/_cluster/health --expect-status-code 200 --timeout 100s
     fi
 
-    TABLE=$(mysql shopware -s -N -e 'SHOW TABLES LIKE "system_config";')
+    TABLE=$($DEVENV_PROFILE/bin/mysql shopware -s -N -e 'SHOW TABLES LIKE "system_config";')
 
     if [[ $TABLE == "" ]]; then
       echo "Table system_config is missing. Run >updateSystemConfig< manually to ensure the dev status of your setup!"