Vsiles/opengl

30-vm-test/README.md

@@ -0,0 +1,5 @@
+# Testing Nixos VMs
+
+- run `nix run .#vm` to drop down in the VM
+- run `sudo poweroff` to exit the VM
+- run `nix build .#test` to run tests on the VM

30-vm-test/flake.nix

@@ -1,26 +1,47 @@
 {
   description = "Test VM";
   inputs = {
-    nixpkgs.url = "nixpkgs/nixos-24.05";
+    nixpkgs.url = "nixpkgs/nixos-unstable";
     axumServer = {
       url = "path:./svc";
     };
+    openglStuff = {
+      url = "path:./vsiles-gl";
+    };
   };
   outputs =
     {
       self,
       nixpkgs,
       axumServer,
+      openglStuff,
     }:
     let
       my_modules = [
         ./base.nix
         ./vm.nix
         ./svc-module.nix
+        ./opengl-module.nix
+      ];
+      openglStuffOverlay =
+        final: prev:
+        {
+
+          vsiles-gl = prev.vsiles-gl.overrideAttrs (oldAttrs: {
+            nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ prev.mesa.llvmpipeHook ];
+          });
+        };
+      overlayApply =
+        pkgs:
+        ((pkgs.extend axumServer.overlays.default).extend openglStuff.overlays.default).extend openglStuffOverlay;
+      linux-pkgs = overlayApply nixpkgs.legacyPackages.x86_64-linux;
+      darwin-pkgs = overlayApply nixpkgs.legacyPackages.aarch64-darwin;
+      linux-guest-pkgs = overlayApply nixpkgs.legacyPackages.aarch64-linux;
+      myOverlays = [
+        axumServer.overlays.default
+        openglStuff.overlays.default
+        openglStuffOverlay
       ];
-      linux-pkgs = nixpkgs.legacyPackages.x86_64-linux.extend axumServer.overlays.default;
-      darwin-pkgs = nixpkgs.legacyPackages.aarch64-darwin.extend axumServer.overlays.default;
-      linux-guest-pkgs = nixpkgs.legacyPackages.aarch64-linux.extend axumServer.overlays.default;
       tester =
         {
           host-pkgs,
@@ -49,7 +70,7 @@
             result = machine.succeed("ps aux | grep svc")
             print(result)
             # Testing GET
-            result = machine.succeed("${guest-pkgs.curl}/bin/curl http://localhost:3000 -X GET")
+            result = machine.succeed("${guest-pkgs.curl}/bin/curl -X GET http://localhost:3000")
             assert result == "Hello, You!"
 
           '';
@@ -59,7 +80,7 @@
       nixosConfigurations.linuxVM = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
         modules = [
-          { nixpkgs.overlays = [ axumServer.overlays.default ]; }
+          { nixpkgs.overlays = myOverlays; }
         ] ++ my_modules;
       };
       packages.x86_64-linux.vm = self.nixosConfigurations.linuxVM.config.system.build.vm;
@@ -72,7 +93,7 @@
       nixosConfigurations.darwinVM = nixpkgs.lib.nixosSystem {
         system = "aarch64-linux";
         modules = [
-          { nixpkgs.overlays = [ axumServer.overlays.default ]; }
+          { nixpkgs.overlays = myOverlays; }
           # This VM will use the host /nix/store thus avoid 'Exec format error'
           { virtualisation.vmVariant.virtualisation.host.pkgs = darwin-pkgs; }
         ] ++ my_modules;

30-vm-test/opengl-module.nix

@@ -0,0 +1,19 @@
+ { config, pkgs, ... }:
+    let
+      vsiles-gl = pkgs.vsiles-gl;
+      vsiles-setup = pkgs.writeShellScriptBin "vsiles-setup" ''
+        set -x
+        Xvfb :99 -ac -noreset +extension GLX +extension RANDR +extension RENDER +render -screen 0 3840x2160x24 -nolisten tcp -nolisten unix
+      '';
+    in
+{
+  environment.systemPackages = [
+    vsiles-gl
+    pkgs.glxinfo
+    pkgs.xorg.xorgserver
+    vsiles-setup
+  ];
+}
+
+# DISPLAY=:99 glxinfox
+

30-vm-test/svc/flake.nix

@@ -2,7 +2,7 @@
   description = "A Rust server with Axum and a curl script";
 
   inputs = {
-    nixpkgs.url = "nixpkgs/nixos-24.05";
+    nixpkgs.url = "nixpkgs/nixos-unstable";
     flake-utils.url = "github:numtide/flake-utils";
     rust-overlay.url = "github:oxalica/rust-overlay";
     rust-overlay.inputs.nixpkgs.follows = "nixpkgs";