queue-runner: change Machine object creation to work around clang bug

https://github.com/llvm/llvm-project/issues/106123

flake.nix

@@ -73,6 +73,21 @@
         default = pkgsBySystem.${system}.hydra;
       });
 
+      devShells = forEachSystem (system: let
+        pkgs = pkgsBySystem.${system};
+        lib = pkgs.lib;
+
+        mkDevShell = stdenv: (pkgs.mkShell.override { inherit stdenv; }) {
+          inputsFrom = [ (self.packages.${system}.default.override { inherit stdenv; }) ];
+
+          packages =
+            lib.optional (stdenv.cc.isClang && stdenv.hostPlatform == stdenv.buildPlatform) pkgs.clang-tools;
+        };
+      in {
+        default = mkDevShell pkgs.stdenv;
+        clang = mkDevShell pkgs.clangStdenv;
+      });
+
       nixosModules = import ./nixos-modules {
         overlays = overlayList;
       };

src/hydra-queue-runner/hydra-queue-runner.cc

@@ -173,7 +173,7 @@ void State::parseMachines(const std::string & contents)
 
         using MaxJobs = std::remove_const<decltype(nix::Machine::maxJobs)>::type;
 
-        auto machine = std::make_shared<::Machine>(nix::Machine {
+        auto machine = std::make_shared<::Machine>(::Machine {{
             // `storeUri`, not yet used
             "",
             // `systemTypes`, not yet used
@@ -194,7 +194,7 @@ void State::parseMachines(const std::string & contents)
             tokens[7] != "" && tokens[7] != "-"
                 ? base64Decode(tokens[7])
                 : "",
-        });
+        }});
 
         machine->sshName = tokens[0];
         machine->systemTypesSet = tokenizeString<StringSet>(tokens[1], ",");