From 3ef7bffcae5b436f35dde8abb268f89080a38453 Mon Sep 17 00:00:00 2001
From: Guillaume Bouchard <guillaum.bouchard@gmail.com>
Date: Sun, 26 Apr 2020 15:24:26 +0200
Subject: [PATCH] Use makeLibraryPath when appropriate

---
 default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/default.nix b/default.nix
index 36aed93..806b403 100644
--- a/default.nix
+++ b/default.nix
@@ -55,8 +55,8 @@ rec {
     name = "nixGLNvidiaBumblebee";
     text = ''
       #!/usr/bin/env sh
-      export LD_LIBRARY_PATH=${nvidia}/lib:$LD_LIBRARY_PATH
-      ${bumblebee}/bin/optirun --ldpath ${libglvnd}/lib:${nvidia}/lib "$@"
+      export LD_LIBRARY_PATH=${lib.makeLibraryPath [nvidia]}:$LD_LIBRARY_PATH
+      ${bumblebee}/bin/optirun --ldpath ${lib.makeLibraryPath [libglvnd nvidia]} "$@"
       '';
   };
 
@@ -83,8 +83,11 @@ rec {
     name = "nixGLIntel";
     text = ''
       #!/usr/bin/env sh
-      export LIBGL_DRIVERS_PATH=${mesa_drivers}/lib/dri
-      export LD_LIBRARY_PATH=${mesa_drivers}/lib:$LD_LIBRARY_PATH
+      export LIBGL_DRIVERS_PATH=${lib.makeSearchPathOutput "lib" "lib/dri" [mesa_drivers]}
+      export LD_LIBRARY_PATH=${
+        lib.makeLibraryPath [
+        mesa_drivers]
+        }:$LD_LIBRARY_PATH
       "$@"
       '';
   };