From 13d55dd65afcd4c30b59ef7f07cf79c7db8734cf Mon Sep 17 00:00:00 2001 From: Kai Wohlfahrt Date: Fri, 18 May 2018 23:41:42 +0100 Subject: [PATCH] houdini: Fix libGL (#40736) (cherry picked from commit f07c44bb7c8e71123cab80134eace62bc7ecc6dc) PR was incorrectly based on staging instead of master. --- pkgs/applications/misc/houdini/runtime.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/houdini/runtime.nix b/pkgs/applications/misc/houdini/runtime.nix index 7477e5c0af2..b92012a29dd 100644 --- a/pkgs/applications/misc/houdini/runtime.nix +++ b/pkgs/applications/misc/houdini/runtime.nix @@ -1,11 +1,11 @@ -{ stdenv, requireFile, zlib, libpng, libSM, libICE, fontconfig, xorg, libGLU, alsaLib, dbus, xkeyboardconfig, bc }: +{ stdenv, requireFile, zlib, libpng, libSM, libICE, fontconfig, xorg, libGLU, libGL, alsaLib, dbus, xkeyboardconfig, bc }: let ld_library_path = builtins.concatStringsSep ":" [ "${stdenv.cc.cc.lib}/lib64" - "/run/opengl-driver/lib" (stdenv.lib.makeLibraryPath [ libGLU + libGL xorg.libXmu xorg.libXi xorg.libXext