back round 0 view raw

nix/vm: fix on non-Linux systems #436

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

+14 -1

flake.nix

+14 -1

flake.nix

···

       182
       182
        
                 if pkgs.stdenv.hostPlatform.isAarch64

     

       183
       183
        
                 then "aarch64"

     

       184
       184
        
                 else "x86_64";

     

       185
       185
       +
       

     

       186
       186
       +
               nixos-shell = pkgs.nixos-shell.overrideAttrs (old: {

     

       187
       187
       +
                 patches =

     

       188
       188
       +
                   (old.patches or [])

     

       189
       189
       +
                   ++ [

     

       190
       190
       +
                     # https://github.com/Mic92/nixos-shell/pull/94

     

       191
       191
       +
                     (pkgs.fetchpatch {

     

       192
       192
       +
                       name = "fix-foreign-vm.patch";

     

       193
       193
       +
                       url = "https://github.com/Mic92/nixos-shell/commit/113e4cc55ae236b5b0b1fbd8b321e9b67c77580e.patch";

     

       194
       194
       +
                       hash = "sha256-eauetBK0wXAOcd9PYbExokNCiwz2QyFnZ4FnwGi9VCo=";

     

       195
       195
       +
                     })

     

       196
       196
       +
                   ];

     

       197
       197
       +
               });

     

       185
       198
        
             in {

     

       186
       199
        
               type = "app";

     

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

     

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

     

       201
       201
       +
                 ${nixos-shell}/bin/nixos-shell --flake .#vm-${system} --guest-system ${system}-linux

     

       189
       202
        
               '');

     

       190
       203
        
             };

     

       191
       204
        
             gomod2nix = {