wip

metacraft-labs · Jun 26, 2024 · 8c7b681 · 8c7b681
1 parent 60b756f
commit 8c7b681
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 26 deletions.
diff --git a/packages/mcl/default.nix b/packages/mcl/default.nix
@@ -6,30 +6,29 @@
   fetchgit,
   ...
 }: let
-  deps = with pkgs; [
-    cachix
-    git
-    nix
-    nom
-    nix-eval-jobs
-    curl
-    gawk
-    dmidecode
-    jc
-    edid-decode
-    coreutils-full
-    util-linux
-    xorg.xrandr
-    glxinfo
-    nixos-install-tools
-    perl
-    systemd
-    alejandra
-    openssh
-  ];
+  inherit (pkgs.hostPlatform) isLinux isx86;
+  deps = with pkgs;
+    [
+      cachix
+      git
+      nix
+      nom
+      nix-eval-jobs
+      curl
+      gawk
+      jc
+      edid-decode
+      coreutils-full
+      util-linux
+      xorg.xrandr
+      perl
+      alejandra
+      openssh
+    ]
+    ++ lib.optionals (isLinux && isx86) [dmidecode glxinfo nixos-install-tools systemd];
   excludedTests = (
     lib.concatStringsSep "|" [
-      "(nix\\.(build|run))"
+      "(nix\\.(build|run|eval))"
       "fetchJson|(coda\.)"
     ]
   );
@@ -52,10 +51,9 @@ in
       wrapProgram $out/bin/${pname} --set PATH "${lib.makeBinPath deps}"
     '';
 
-    dubBuildFlags = ["--compiler=dmd" "-b" "debug"];
+    dubBuildFlags = ["-b" "debug"];
 
     dubTestFlags = [
-      "--compiler=dmd"
       "--"
       "-e"
       excludedTests

diff --git a/packages/mcl/src/src/mcl/commands/host_info.d b/packages/mcl/src/src/mcl/commands/host_info.d
@@ -178,8 +178,6 @@ Info getInfo()
     return info;
 }
 
-
-
 struct Info
 {
     SoftwareInfo softwareInfo;
-Original file line number
+Diff line change
@@ Expand Up / @@ -178,8 +178,6 @@ Info getInfo() @@
         return info;
     }
     struct Info
     {
         SoftwareInfo softwareInfo;
@@ Expand Down @@