Support aarch64 nixos deployments

digitallyinduced · May 19, 2024 · fa107a6 · fa107a6
1 parent 5718a7c
commit fa107a6
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/NixSupport/nixosModules/options.nix b/NixSupport/nixosModules/options.nix
@@ -77,7 +77,7 @@ with lib;
 
         package = mkOption {
             type = types.package;
-            default = if config.services.ihp.optimized then self.packages.x86_64-linux.optimized-prod-server else self.packages.x86_64-linux.default;
+            default = if config.services.ihp.optimized then self.packages."${pkgs.system}".optimized-prod-server else self.packages."${pkgs.system}".default;
         };
 
         optimized = mkOption {

diff --git a/NixSupport/nixosModules/services/app.nix b/NixSupport/nixosModules/services/app.nix
@@ -1,7 +1,6 @@
 { config, pkgs, modulesPath, lib, self, ... }:
 let
     cfg = config.services.ihp;
-    ihpApp = self.packages.x86_64-linux.default;
 in
 {
     systemd.services.app = {

diff --git a/NixSupport/nixosModules/services/loadSchema.nix b/NixSupport/nixosModules/services/loadSchema.nix
@@ -8,8 +8,8 @@ in
         };
         script = ''
             DB_URL=''${DATABASE_URL:-''${DEFAULT_DATABASE_URL}}
-            psql "$DB_URL" < ${self.packages.x86_64-linux.ihp-schema}/IHPSchema.sql
-            psql "$DB_URL" < ${self.packages.x86_64-linux.schema}/Schema.sql
+            psql "$DB_URL" < ${self.packages."${pkgs.system}".ihp-schema}/IHPSchema.sql
+            psql "$DB_URL" < ${self.packages."${pkgs.system}".schema}/Schema.sql
         '';
         environment = {
             DEFAULT_DATABASE_URL = cfg.databaseUrl;

diff --git a/NixSupport/nixosModules/services/migrate.nix b/NixSupport/nixosModules/services/migrate.nix
@@ -17,7 +17,7 @@ in
             };
             script = ''
                 cd ${migrateApp}
-                ${ihp.apps.x86_64-linux.migrate.program}
+                ${ihp.apps."${pkgs.system}".migrate.program}
             '';
             environment = {
                 DATABASE_URL = cfg.databaseUrl;