From f8a7597f5d80c116d775e86175f5b7592be9b441 Mon Sep 17 00:00:00 2001 From: rczb Date: Sat, 16 Aug 2025 11:06:05 +0800 Subject: [PATCH] racket: make lib paths consistent --- pkgs/by-name/ra/racket/package.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/ra/racket/package.nix b/pkgs/by-name/ra/racket/package.nix index 45ee63f0ec7e..82be2c38d614 100644 --- a/pkgs/by-name/ra/racket/package.nix +++ b/pkgs/by-name/ra/racket/package.nix @@ -26,13 +26,6 @@ let minimal = racket-minimal.override { inherit disableDocs; }; - makeLibPaths = lib.concatMapStringsSep " " ( - lib.flip lib.pipe [ - lib.getLib - (x: ''"${x}/lib"'') - ] - ); - manifest = lib.importJSON ./manifest.json; inherit (stdenv.hostPlatform) isDarwin; in @@ -71,7 +64,6 @@ minimal.overrideAttrs ( preBuild = let - libPaths = makeLibPaths finalAttrs.buildInputs; libPathsVar = if isDarwin then "DYLD_FALLBACK_LIBRARY_PATH" else "LD_LIBRARY_PATH"; in /* @@ -79,7 +71,13 @@ minimal.overrideAttrs ( dependencies, which is integrated into the build process of Racket */ '' - for lib_path in ${libPaths}; do + for lib_path in $( \ + echo "$NIX_LDFLAGS" \ + | tr ' ' '\n' \ + | grep '^-L' \ + | sed 's/^-L//' \ + | awk '!seen[$0]++' \ + ); do addToSearchPath ${libPathsVar} $lib_path done ''