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

nixos.nix

@@ -82,8 +82,7 @@ in
                     own = [
                       "${id}.*"
                       "org.mpris.MediaPlayer2.${id}.*"
-                    ]
+                    ] ++ ext.own;
-                    ++ ext.own;
 
                     inherit (ext) call broadcast;
                   };
@@ -176,26 +175,27 @@ in
                       auto_etc = true;
                       cover = [ "/var/run/nscd" ];
 
-                      symlink = [
+                      symlink =
-                        [
-                          "*/run/current-system"
-                          "/run/current-system"
-                        ]
-                      ]
-                      ++ optionals (isGraphical && config.hardware.graphics.enable) (
                         [
                           [
-                            config.systemd.tmpfiles.settings.graphics-driver."/run/opengl-driver"."L+".argument
+                            "*/run/current-system"
-                            "/run/opengl-driver"
+                            "/run/current-system"
                           ]
                         ]
-                        ++ optionals (app.multiarch && config.hardware.graphics.enable32Bit) [
+                        ++ optionals (isGraphical && config.hardware.graphics.enable) (
                           [
-                            config.systemd.tmpfiles.settings.graphics-driver."/run/opengl-driver-32"."L+".argument
+                            [
-                            /run/opengl-driver-32
+                              config.systemd.tmpfiles.settings.graphics-driver."/run/opengl-driver"."L+".argument
+                              "/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,17 +83,18 @@ buildGoModule rec {
   # nix build environment does not allow acls
   env.GO_TEST_SKIP_ACL = 1;
 
-  buildInputs = [
+  buildInputs =
-    libffi
+    [
-    libseccomp
+      libffi
-    acl
+      libseccomp
-    wayland
+      acl
-  ]
+      wayland
-  ++ (with xorg; [
+    ]
-    libxcb
+    ++ (with xorg; [
-    libXau
+      libxcb
-    libXdmcp
+      libXau
-  ]);
+      libXdmcp
+    ]);
 
   nativeBuildInputs = [
     pkg-config
@@ -129,16 +130,17 @@ buildGoModule rec {
         }
     '';
 
-  passthru.targetPkgs = [
+  passthru.targetPkgs =
-    go
+    [
-    gcc
+      go
-    xorg.xorgproto
+      gcc
-    util-linux
+      xorg.xorgproto
+      util-linux
 
-    # for go generate
+      # for go generate
-    wayland-protocols
+      wayland-protocols
-    wayland-scanner
+      wayland-scanner
-  ]
+    ]
-  ++ buildInputs
+    ++ buildInputs
-  ++ nativeBuildInputs;
+    ++ nativeBuildInputs;
 }