From cd8c7a79511de67810360c91063db4551339e463 Mon Sep 17 00:00:00 2001
From: FlameFlag <57304299+FlameFlag@users.noreply.github.com>
Date: Fri, 29 Aug 2025 16:54:25 +0300
Subject: [PATCH 1/2] yazi: quote paths

---
 pkgs/by-name/ya/yazi/package.nix | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/ya/yazi/package.nix b/pkgs/by-name/ya/yazi/package.nix
index 112147d182b6..b3b7c0b3b76a 100644
--- a/pkgs/by-name/ya/yazi/package.nix
+++ b/pkgs/by-name/ya/yazi/package.nix
@@ -58,36 +58,36 @@ let
       null
     else
       runCommand "YAZI_CONFIG_HOME" { } ''
-        mkdir -p $out
+        mkdir -p "$out"
         ${lib.concatMapStringsSep "\n" (
           name:
           lib.optionalString (settings ? ${name} && settings.${name} != { }) ''
-            ln -s ${settingsFormat.generate "${name}.toml" settings.${name}} $out/${name}.toml
+            ln -s ${settingsFormat.generate "${name}.toml" settings.${name}} "$out/${name}.toml"
           ''
         ) files}
 
-        mkdir $out/plugins
+        mkdir "$out/plugins"
         ${lib.optionalString (plugins != { }) ''
           ${lib.concatStringsSep "\n" (
             lib.mapAttrsToList (
               name: value:
-              "ln -s ${value} $out/plugins/${if lib.hasSuffix ".yazi" name then name else "${name}.yazi"}"
+              ''ln -s ${value} "$out/plugins/${if lib.hasSuffix ".yazi" name then name else "${name}.yazi"}"''
             ) plugins
           )}
         ''}
 
-        mkdir $out/flavors
+        mkdir "$out/flavors"
         ${lib.optionalString (flavors != { }) ''
           ${lib.concatStringsSep "\n" (
             lib.mapAttrsToList (
               name: value:
-              "ln -s ${value} $out/flavors/${if lib.hasSuffix ".yazi" name then name else "${name}.yazi"}"
+              ''ln -s ${value} "$out/flavors/${if lib.hasSuffix ".yazi" name then name else "${name}.yazi"}"''
             ) flavors
           )}
         ''}
 
 
-        ${lib.optionalString (initLua != null) "ln -s ${initLua} $out/init.lua"}
+        ${lib.optionalString (initLua != null) ''ln -s "${initLua}" "$out/init.lua"''}
       '';
 in
 runCommand yazi-unwrapped.name
@@ -97,10 +97,10 @@ runCommand yazi-unwrapped.name
     nativeBuildInputs = [ makeWrapper ];
   }
   ''
-    mkdir -p $out/bin
-    ln -s ${yazi-unwrapped}/share $out/share
-    ln -s ${yazi-unwrapped}/bin/ya $out/bin/ya
-    makeWrapper ${yazi-unwrapped}/bin/yazi $out/bin/yazi \
+    mkdir -p "$out/bin"
+    ln -s "${yazi-unwrapped}/share" "$out/share"
+    ln -s ${yazi-unwrapped}/bin/ya "$out/bin/ya"
+    makeWrapper ${yazi-unwrapped}/bin/yazi "$out/bin/yazi" \
       --prefix PATH : ${lib.makeBinPath runtimePaths} \
       ${lib.optionalString (configHome != null) "--set YAZI_CONFIG_HOME ${configHome}"}
   ''

From f698e18f9b904c02a1c43e1f40751ecc2b77c4c4 Mon Sep 17 00:00:00 2001
From: FlameFlag <57304299+FlameFlag@users.noreply.github.com>
Date: Fri, 29 Aug 2025 16:56:46 +0300
Subject: [PATCH 2/2] yazi: use `lib.getExe'`

---
 pkgs/by-name/ya/yazi/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ya/yazi/package.nix b/pkgs/by-name/ya/yazi/package.nix
index b3b7c0b3b76a..7248aa46f9f3 100644
--- a/pkgs/by-name/ya/yazi/package.nix
+++ b/pkgs/by-name/ya/yazi/package.nix
@@ -99,8 +99,8 @@ runCommand yazi-unwrapped.name
   ''
     mkdir -p "$out/bin"
     ln -s "${yazi-unwrapped}/share" "$out/share"
-    ln -s ${yazi-unwrapped}/bin/ya "$out/bin/ya"
-    makeWrapper ${yazi-unwrapped}/bin/yazi "$out/bin/yazi" \
+    ln -s ${lib.getExe' yazi-unwrapped "ya"} "$out/bin/ya"
+    makeWrapper ${lib.getExe' yazi-unwrapped "yazi"} "$out/bin/yazi" \
       --prefix PATH : ${lib.makeBinPath runtimePaths} \
       ${lib.optionalString (configHome != null) "--set YAZI_CONFIG_HOME ${configHome}"}
   ''