Merge pull request #944 from mcdonc/user-libraries-first-on-ldpath

Put user libraries first on LD_LIBRARY_PATH
cachix · Jan 20, 2024 · 6048f1e · 6048f1e
2 parents 48bcaab + 15d289a
commit 6048f1e
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/modules/languages/python.nix b/src/modules/languages/python.nix
@@ -2,11 +2,11 @@
 
 let
   cfg = config.languages.python;
-  libraries = lib.makeLibraryPath
-    ((lib.optional cfg.manylinux.enable pkgs.pythonManylinuxPackages.manylinux2014Package)
-      # see https://matrix.to/#/!kjdutkOsheZdjqYmqp:nixos.org/$XJ5CO4bKMevYzZq_rrNo64YycknVFJIJTy6hVCJjRlA?via=nixos.org&via=matrix.org&via=nixos.dev
-      ++ [ pkgs.stdenv.cc.cc.lib ]
-      ++ cfg.libraries
+  libraries = lib.makeLibraryPath (
+    cfg.libraries
+    ++ (lib.optional cfg.manylinux.enable pkgs.pythonManylinuxPackages.manylinux2014Package)
+    # see https://matrix.to/#/!kjdutkOsheZdjqYmqp:nixos.org/$XJ5CO4bKMevYzZq_rrNo64YycknVFJIJTy6hVCJjRlA?via=nixos.org&via=matrix.org&via=nixos.dev
+    ++ [ pkgs.stdenv.cc.cc.lib ]
     );
 
   readlink = "${pkgs.coreutils}/bin/readlink -f ";