diff options
author | Uli Baum <xeji@cat3.de> | 2018-05-19 00:55:41 +0200 |
---|---|---|
committer | Uli Baum <xeji@cat3.de> | 2018-05-19 00:55:41 +0200 |
commit | fc716e64a7d0ff8c1f94f16c1524242ffb0e18b6 (patch) | |
tree | 90cc8330711580f0a5f0df1f3f3a8dcb1b3282c2 /pkgs/applications | |
parent | f07c44bb7c8e71123cab80134eace62bc7ecc6dc (diff) | |
download | nixlib-fc716e64a7d0ff8c1f94f16c1524242ffb0e18b6.tar nixlib-fc716e64a7d0ff8c1f94f16c1524242ffb0e18b6.tar.gz nixlib-fc716e64a7d0ff8c1f94f16c1524242ffb0e18b6.tar.bz2 nixlib-fc716e64a7d0ff8c1f94f16c1524242ffb0e18b6.tar.lz nixlib-fc716e64a7d0ff8c1f94f16c1524242ffb0e18b6.tar.xz nixlib-fc716e64a7d0ff8c1f94f16c1524242ffb0e18b6.tar.zst nixlib-fc716e64a7d0ff8c1f94f16c1524242ffb0e18b6.zip |
Revert "houdini: Fix libGL (#40736)"
This reverts commit f07c44bb7c8e71123cab80134eace62bc7ecc6dc. PR was incorrectly based on staging instead of master.
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/misc/houdini/runtime.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/misc/houdini/runtime.nix b/pkgs/applications/misc/houdini/runtime.nix index b92012a29ddb..7477e5c0af2a 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 |