WIP fix baseNameOf (needs test maybe)

NixOS#10252 (comment)
tomberek · Aug 23, 2024 · ed16517 · ed16517
1 parent a4ef062
commit ed16517
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc
@@ -1704,7 +1704,10 @@ static std::string_view legacyBaseNameOf(std::string_view path)
 static void prim_baseNameOf(EvalState & state, const PosIdx pos, Value * * args, Value & v)
 {
     NixStringContext context;
-    v.mkString(legacyBaseNameOf(*state.coerceToString(pos, *args[0], context,
+    if (v.type() == nPath)
+        v.mkString(baseNameOf(v.path().path.abs()), context);
+    else
+        v.mkString(legacyBaseNameOf(*state.coerceToString(pos, *args[0], context,
             "while evaluating the first argument passed to builtins.baseNameOf",
             false, false)), context);
 }