diff --git a/clients/quadraticserver/dav.nix b/clients/quadraticserver/dav.nix index eba9f16..f1abd43 100644 --- a/clients/quadraticserver/dav.nix +++ b/clients/quadraticserver/dav.nix @@ -15,7 +15,7 @@ hostname = domain; appSecretFile = config.age.secrets."davSecret.age".path; adminPasswordFile = config.age.secrets."davPassword.age".path; - package = inputs.nixpkgs-master.legacyPackages.${pkgs.system}.davis; + package = inputs.nixpkgs-master.legacyPackages.${pkgs.stdenv.hostPlatform.system}.davis; nginx = null; poolConfig = with config.services.caddy; { diff --git a/clients/quadraticserver/docs/default.nix b/clients/quadraticserver/docs/default.nix index 5b85679..c4b7e40 100644 --- a/clients/quadraticserver/docs/default.nix +++ b/clients/quadraticserver/docs/default.nix @@ -47,12 +47,18 @@ in enableNginx = false; redis.createLocally = true; postgresql.createLocally = true; - backendPackage = pkgs.lasuite-docs.overrideAttrs { - patches = [ ./enable-languages.patch ]; - }; - frontendPackage = pkgs.lasuite-docs-frontend.overrideAttrs { - NEXT_PUBLIC_PUBLISH_AS_MIT = "false"; - }; + backendPackage = + inputs.nixpkgs-lasuite.legacyPackages.${pkgs.stdenv.hostPlatform.system}.lasuite-docs.overrideAttrs + { + patches = [ ./enable-languages.patch ]; + }; + frontendPackage = + inputs.nixpkgs-lasuite.legacyPackages.${pkgs.stdenv.hostPlatform.system}.lasuite-docs-frontend.overrideAttrs + { + NEXT_PUBLIC_PUBLISH_AS_MIT = "false"; + }; + collaborationServer.package = + inputs.nixpkgs-lasuite.legacyPackages.${pkgs.stdenv.hostPlatform.system}.lasuite-docs-collaboration-server; bind = "unix:${socket}"; inherit s3Url domain; diff --git a/flake.lock b/flake.lock index 904d462..dd430b3 100644 --- a/flake.lock +++ b/flake.lock @@ -2155,6 +2155,21 @@ "type": "github" } }, + "nixpkgs-lasuite": { + "locked": { + "lastModified": 1768663811, + "narHash": "sha256-yLh+eSqrsDL9ITH6WmVfcOv9GkABaIkocZ9DkR6dBac=", + "owner": "Henry-Hiles", + "repo": "nixpkgs", + "rev": "950f864b43d347f211cb5df74ead1c0bce2b4e97", + "type": "github" + }, + "original": { + "owner": "Henry-Hiles", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-latest": { "locked": { "lastModified": 1752336159, @@ -2560,6 +2575,7 @@ "nix-maid": "nix-maid", "nix-matrix-appservices": "nix-matrix-appservices", "nixpkgs": "nixpkgs", + "nixpkgs-lasuite": "nixpkgs-lasuite", "nixpkgs-master": "nixpkgs-master", "run0-sudo-shim": "run0-sudo-shim", "sdm845": "sdm845", diff --git a/flake.nix b/flake.nix index 175496f..f3ba1d7 100755 --- a/flake.nix +++ b/flake.nix @@ -3,6 +3,7 @@ gnome-mobile.url = "github:chuangzhu/nixpkgs-gnome-mobile"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs-master.url = "github:nixos/nixpkgs"; + nixpkgs-lasuite.url = "github:Henry-Hiles/nixpkgs"; wrapper-manager.url = "github:viperML/wrapper-manager"; flake-parts.url = "github:hercules-ci/flake-parts"; nix-maid.url = "github:viperML/nix-maid"; diff --git a/modules/mobile/repart.nix b/modules/mobile/repart.nix index f11b05e..88eab40 100644 --- a/modules/mobile/repart.nix +++ b/modules/mobile/repart.nix @@ -47,7 +47,7 @@ in } }/shell.efi"; "/EFI/BOOT/BOOT${lib.toUpper efiArch}.EFI".source = - "${pkgs.systemd}/lib/systemd/boot/efi/systemd-boot${efiArch}.efi"; + "${pkgs.stdenv.hostPlatform.systemd}/lib/systemd/boot/efi/systemd-boot${efiArch}.efi"; "/EFI/Linux/${config.system.boot.loader.ukiFile}".source = "${config.system.build.uki}/${config.system.boot.loader.ukiFile}"; "/loader/loader.conf".source = crossPkgs.writeText "loader.conf" ''