Quellcode durchsuchen

nix-shell: use addToSearchPath

thx to @SomeoneSerge for the suggestion!
Michael Hueschen vor 2 Jahren
Ursprung
Commit
c9b316c78f
1 geänderte Dateien mit 1 neuen und 4 gelöschten Zeilen
  1. 1 4
      .devops/nix/package.nix

+ 1 - 4
.devops/nix/package.nix

@@ -221,15 +221,12 @@ effectiveStdenv.mkDerivation (
         ;
 
       shell = mkShell {
-        NIX_LD_LIBRARY_PATH = lib.makeLibraryPath [
-          effectiveStdenv.cc.cc
-        ];
         name = "shell-${finalAttrs.finalPackage.name}";
         description = "contains numpy and sentencepiece";
         buildInputs = [ llama-python ];
         inputsFrom = [ finalAttrs.finalPackage ];
         shellHook = ''
-          export LD_LIBRARY_PATH=$NIX_LD_LIBRARY_PATH
+          addToSearchPath "LD_LIBRARY_PATH" "${lib.getLib effectiveStdenv.cc.cc}/lib"
         '';
       };