back round 0 view raw

nix/vm: add aarch64 support #434

merged

opened by

winter.bsky.social 4 months ago targeting master from winter.bsky.social/core: push-ynzsmmzxzqzy

Signed-off-by: Winter winter@winter.cafe

options

unified split

Changed files

+17 -4

flake.nix

nix

vm.nix

+15 -3

flake.nix

···

       177
        
               type = "app";

     

       178
        
               program = ''${tailwind-watcher}/bin/run'';

     

       179
        
             };

     

       180
       -
             vm = {

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       181
        
               type = "app";

     

       182
        
               program = toString (pkgs.writeShellScript "vm" ''

     

       183
       -
                 ${pkgs.nixos-shell}/bin/nixos-shell --flake .#vm

     

       184
        
               '');

     

       185
        
             };

     

       186
        
             gomod2nix = {

     
···

       218
        
       

     

       219
        
             services.tangled-spindle.package = lib.mkDefault self.packages.${pkgs.system}.spindle;

     

       220
        
           };

     

       221
       -
           nixosConfigurations.vm = import ./nix/vm.nix {inherit self nixpkgs;};

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       222
        
         };

     

       223
        
       }

···

       177
        
               type = "app";

     

       178
        
               program = ''${tailwind-watcher}/bin/run'';

     

       179
        
             };

     

       180
       +
             vm = let

     

       181
       +
               system =

     

       182
       +
                 if pkgs.stdenv.hostPlatform.isAarch64

     

       183
       +
                 then "aarch64"

     

       184
       +
                 else "x86_64";

     

       185
       +
             in {

     

       186
        
               type = "app";

     

       187
        
               program = toString (pkgs.writeShellScript "vm" ''

     

       188
       +
                 ${pkgs.nixos-shell}/bin/nixos-shell --flake .#vm-${system}

     

       189
        
               '');

     

       190
        
             };

     

       191
        
             gomod2nix = {

     
···

       223
        
       

     

       224
        
             services.tangled-spindle.package = lib.mkDefault self.packages.${pkgs.system}.spindle;

     

       225
        
           };

     

       226
       +
           nixosConfigurations.vm-x86_64 = import ./nix/vm.nix {

     

       227
       +
             inherit self nixpkgs;

     

       228
       +
             system = "x86_64-linux";

     

       229
       +
           };

     

       230
       +
           nixosConfigurations.vm-aarch64 = import ./nix/vm.nix {

     

       231
       +
             inherit self nixpkgs;

     

       232
       +
             system = "aarch64-linux";

     

       233
       +
           };

     

       234
        
         };

     

       235
        
       }

+2 -1

nix/vm.nix

···

       1
        
       {

     

       2
        
         nixpkgs,

     

       0
        
       
     

       3
        
         self,

     

       4
        
       }:

     

       5
        
       nixpkgs.lib.nixosSystem {

     

       6
       -
         system = "x86_64-linux";

     

       7
        
         modules = [

     

       8
        
           self.nixosModules.knot

     

       9
        
           self.nixosModules.spindle

···

       1
        
       {

     

       2
        
         nixpkgs,

     

       3
       +
         system,

     

       4
        
         self,

     

       5
        
       }:

     

       6
        
       nixpkgs.lib.nixosSystem {

     

       7
       +
         inherit system;

     

       8
        
         modules = [

     

       9
        
           self.nixosModules.knot

     

       10
        
           self.nixosModules.spindle