From: timor <timor.dd@googlemail.com>
Date: Sat, 21 Nov 2020 16:48:07 +0000 (+0100)
Subject: shell.nix: use correct opengl dependencies, fix runtime lib path
X-Git-Tag: 0.99~2615
X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=commitdiff_plain;h=c2bc765dc63c3e9803c51c1643ad8f5436dbc38f

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

diff --git a/shell.nix b/shell.nix
index fa19e72dcc..6f729fd156 100644
--- 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