container: access test case by index in helper

This is more elegant and allows for much easier extension of the tests. Mountinfo is still serialised however due to libPaths nondeterminism.

Signed-off-by: Ophestra <cat@gensokyo.uk>

cmd/planterette/build.nix

@@ -215,15 +215,14 @@ stdenv.mkDerivation {
     # create binary cache
     closureInfo="${
       closureInfo {
-        rootPaths =
+        rootPaths = [
-          [
+          homeManagerConfiguration.activationPackage
-            homeManagerConfiguration.activationPackage
+          launcher
-            launcher
+        ]
-          ]
+        ++ optionals gpu [
-          ++ optionals gpu [
+          mesaWrappers
-            mesaWrappers
+          nixGL
-            nixGL
+        ];
-          ];
       }
     }"
     echo "copying application paths..."

nixos.nix

@@ -82,7 +82,8 @@ in
                     own = [
                       "${id}.*"
                       "org.mpris.MediaPlayer2.${id}.*"
-                    ] ++ ext.own;
+                    ]
+                    ++ ext.own;
 
                     inherit (ext) call broadcast;
                   };
@@ -175,27 +176,26 @@ in
                       auto_etc = true;
                       cover = [ "/var/run/nscd" ];
 
-                      symlink =
+                      symlink = [
+                        [
+                          "*/run/current-system"
+                          "/run/current-system"
+                        ]
+                      ]
+                      ++ optionals (isGraphical && config.hardware.graphics.enable) (
                         [
                           [
-                            "*/run/current-system"
+                            config.systemd.tmpfiles.settings.graphics-driver."/run/opengl-driver"."L+".argument
-                            "/run/current-system"
+                            "/run/opengl-driver"
                           ]
                         ]
-                        ++ optionals (isGraphical && config.hardware.graphics.enable) (
+                        ++ optionals (app.multiarch && config.hardware.graphics.enable32Bit) [
                           [
-                            [
+                            config.systemd.tmpfiles.settings.graphics-driver."/run/opengl-driver-32"."L+".argument
-                              config.systemd.tmpfiles.settings.graphics-driver."/run/opengl-driver"."L+".argument
+                            /run/opengl-driver-32
-                              "/run/opengl-driver"
-                            ]
                           ]
-                          ++ optionals (app.multiarch && config.hardware.graphics.enable32Bit) [
+                        ]
-                            [
+                      );
-                              config.systemd.tmpfiles.settings.graphics-driver."/run/opengl-driver-32"."L+".argument
-                              /run/opengl-driver-32
-                            ]
-                          ]
-                        );
                     };
 
                   };

package.nix

@@ -83,18 +83,17 @@ buildGoModule rec {
   # nix build environment does not allow acls
   env.GO_TEST_SKIP_ACL = 1;
 
-  buildInputs =
+  buildInputs = [
-    [
+    libffi
-      libffi
+    libseccomp
-      libseccomp
+    acl
-      acl
+    wayland
-      wayland
+  ]
-    ]
+  ++ (with xorg; [
-    ++ (with xorg; [
+    libxcb
-      libxcb
+    libXau
-      libXau
+    libXdmcp
-      libXdmcp
+  ]);
-    ]);
 
   nativeBuildInputs = [
     pkg-config
@@ -130,17 +129,16 @@ buildGoModule rec {
         }
     '';
 
-  passthru.targetPkgs =
+  passthru.targetPkgs = [
-    [
+    go
-      go
+    gcc
-      gcc
+    xorg.xorgproto
-      xorg.xorgproto
+    util-linux
-      util-linux
 
-      # for go generate
+    # for go generate
-      wayland-protocols
+    wayland-protocols
-      wayland-scanner
+    wayland-scanner
-    ]
+  ]
-    ++ buildInputs
+  ++ buildInputs
-    ++ nativeBuildInputs;
+  ++ nativeBuildInputs;
 }