shell.nix: use correct opengl dependencies, fix runtime lib path

diff --git a/shell.nix b/shell.nix
index fa19e72dcc63db877971ad7408a7dd09d3976093..6f729fd156c87ad9e01b5ab095253dbd20bc7a3f 100644 (file)
--- a/shell.nix
+++ b/shell.nix
@@ -9,7 +9,8 @@ let
     gdk_pixbuf
     gnome2.gtkglext
     pcre
-    mesa_glu
+    libGL
+    libGLU
     freealut
     openssl
     udis86 # available since NixOS 19.09
@@ -18,11 +19,11 @@ let
     libvorbis
     zlib
   ];
-  runtimeLibPath = lib.makeLibraryPath runtimeLibs;
+  runtimeLibPath = "/run/opengl-driver/lib:" + lib.makeLibraryPath runtimeLibs;
 in
 (mkClangShell {
   name = "factor-shell-env";
-  LD_LIBRARY_PATH = "/run/opengl-driver/lib:${runtimeLibPath}" ;
+  LD_LIBRARY_PATH = runtimeLibPath ;
   buildInputs = runtimeLibs ++ [
     # for building factor
     git