Răsfoiți Sursa

nix-shell: use addToSearchPath

thx to @SomeoneSerge for the suggestion!
Michael Hueschen 2 ani în urmă
părinte
comite
c9b316c78f
1 a modificat fișierele cu 1 adăugiri și 4 ștergeri
  1. 1 4
      .devops/nix/package.nix

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

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