From fc716e64a7d0ff8c1f94f16c1524242ffb0e18b6 Mon Sep 17 00:00:00 2001 From: Uli Baum Date: Sat, 19 May 2018 00:55:41 +0200 Subject: [PATCH] Revert "houdini: Fix libGL (#40736)" This reverts 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 b92012a29dd..7477e5c0af2 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, libGL, alsaLib, dbus, xkeyboardconfig, bc }: +{ stdenv, requireFile, zlib, libpng, libSM, libICE, fontconfig, xorg, libGLU, 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