From 04a6b0833fbb46a0f7e83ab477599c5f3eb60564 Mon Sep 17 00:00:00 2001
From: Guillaume Bouchard <guillaume.bouchard@tweag.io>
Date: Thu, 27 Sep 2018 16:03:19 +0200
Subject: [PATCH] Preserve system `LD_LIBRARY_PATH`

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

diff --git a/default.nix b/default.nix
index 2bab984..0394b0b 100644
--- a/default.nix
+++ b/default.nix
@@ -43,7 +43,7 @@ rec {
       mkdir -p $out/bin
       cat > $out/bin/nixGLNvidiaBumblebee << FOO
       #!/usr/bin/env sh
-      export LD_LIBRARY_PATH=${nvidia}/lib
+      export LD_LIBRARY_PATH=${nvidia}/lib:\$LD_LIBRARY_PATH
       ${bumblebee}/bin/optirun --ldpath ${libglvnd}/lib:${nvidia}/lib "\$@"
       FOO
 
@@ -61,7 +61,7 @@ rec {
       mkdir -p $out/bin
       cat > $out/bin/nix${api}Nvidia << FOO
       #!/usr/bin/env sh
-      export LD_LIBRARY_PATH=${libglvnd}/lib:${nvidiaLibsOnly}/lib
+      export LD_LIBRARY_PATH=${libglvnd}/lib:${nvidiaLibsOnly}/lib:\$LD_LIBRARY_PATH
       "\$@"
       FOO
 
@@ -84,7 +84,7 @@ rec {
       cat > $out/bin/nixGLIntel << FOO
       #!/usr/bin/env sh
       export LIBGL_DRIVERS_PATH=${mesa_drivers}/lib/dri
-      export LD_LIBRARY_PATH=${mesa_drivers}/lib
+      export LD_LIBRARY_PATH=${mesa_drivers}/lib:\$LD_LIBRARY_PATH
       "\$@"
       FOO
 
@@ -111,7 +111,7 @@ rec {
        xorg.libxshmfence
        wayland
        gcc.cc
-     ]}
+     ]}:\$LD_LIBRARY_PATH
      exec "\$@"
      EOF
      chmod u+x "$out/bin/nixVulkanIntel"