Merge pull request #578 from SuperSandro2000/patch-1

lib: cleanup from fromYAML
DavHau · Dec 5, 2023 · 98781c6 · 98781c6
2 parents d6ae81d + cd80f43
commit 98781c6
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/mach_nix/nix/lib.nix b/mach_nix/nix/lib.nix
@@ -18,7 +18,7 @@ rec {
   mergeOverrides = foldl composeExtensions (self: super: { });
 
   fromYAML = str:
-    fromJSON (readFile (pkgs.runCommand "yml" { buildInputs = [pkgs.yq pkgs.jq] ;} ''echo '${escape ["'"] str}' | ${pkgs.yq}/bin/yq . > $out''));
+    importJSON (pkgs.runCommand "yml" { nativeBuildInputs = [pkgs.yq] ;} ''echo '${escape ["'"] str}' | yq . > $out'');
 
   isCondaEnvironmentYml = str: hasInfix "\nchannels:\n" str && hasInfix "\ndependencies:\n" str;