Merge pull request #58 from Mic92/nix-ld-fix

undo NIX_LD fallback

Author: mergify[bot]

README.md

@@ -130,6 +130,7 @@ variables set.
 To figure out what libraries a program needs, you can use `ldd` on the binary or
 set the `LD_DEBUG=libs` environment variable.
 
+<!--
 ## Default Configuration for nix-ld
 
 In some scenarios, certain build systems or programs might ignore environment variables,
@@ -144,6 +145,7 @@ This behavior essentially defaults back to the NixOS configuration for nix-ld.
 In terms of library paths, it will default to using the paths specified in `programs.nix-ld.libraries`. 
 This ensures that nix-ld can function effectively, even when its configuration 
 is not explicitly defined through the `NIX_LD` environment variable.
+-->
 
 ## Known Issues
 

nixos-test.nix

@@ -15,7 +15,7 @@ in {
         machine.succeed("$(< ${nix-ld}/nix-support/ldpath) --version")
 
         # test fallback if NIX_LD is not set
-        machine.succeed("unset NIX_LD; unset NIX_LD_LIBRARY_PATH; $(< ${nix-ld}/nix-support/ldpath) $(which hello)")
+        #machine.succeed("unset NIX_LD; unset NIX_LD_LIBRARY_PATH; $(< ${nix-ld}/nix-support/ldpath) $(which hello)")
       '';
     } {
       inherit pkgs;

src/nix-ld.c

@@ -399,15 +399,18 @@ int main(int argc, char** argv, char** envp) {
   struct ld_ctx ctx = init_ld_ctx(argc, argv, envp, auxv);
 
   if (!ctx.nix_ld) {
-    // fallback to default ld.so
-    if (access(DEFAULT_NIX_LD, R_OK) == 0) {
-      ctx.nix_ld = DEFAULT_NIX_LD;
-      // if no NIX_LD is set we also don't trust NIX_LD_LIBRARY_PATH since it may point to a different libc
-      ctx.nix_lib_path_prefix = DEFAULT_NIX_LD_LIBRARY_PATH;
-    } else {
-      log_error(&ctx, "You are trying to run an unpatched binary on nixos, but you have not configured NIX_LD or NIX_LD_" NIX_SYSTEM ". See https://github.com/Mic92/nix-ld for more details");
-      return 1;
-    }
+    // FIXME: fallback to default ld.so
+    // This requires however to also increase envp to have space for the new environment variable
+    //if (access(DEFAULT_NIX_LD, R_OK) == 0) {
+    //  ctx.nix_ld = DEFAULT_NIX_LD;
+    //  // if no NIX_LD is set we also don't trust NIX_LD_LIBRARY_PATH since it may point to a different libc
+    //  ctx.nix_lib_path_prefix = DEFAULT_NIX_LD_LIBRARY_PATH;
+    //} else {
+    //  log_error(&ctx, "You are trying to run an unpatched binary on nixos, but you have not configured NIX_LD or NIX_LD_" NIX_SYSTEM ". See https://github.com/Mic92/nix-ld for more details");
+    //  return 1;
+    //}
+    log_error(&ctx, "You are trying to run an unpatched binary on nixos, but you have not configured NIX_LD or NIX_LD_" NIX_SYSTEM ". See https://github.com/Mic92/nix-ld for more details");
+    return 1;
   }
 
   if (!ctx.page_size) {