diff options
author | Matthew Bauer <mjbauer95@gmail.com> | 2018-07-05 22:14:08 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-05 22:14:08 -0400 |
commit | 81686434bfa218ad8713ba2ed4e9ce5b51207851 (patch) | |
tree | e9be92e89afa5b7b6b8fb78738fd2e11dead4e1f /pkgs/tools | |
parent | 6d6b0796228b3429b9079d1a14e7ebd8f53a14e3 (diff) | |
parent | a0144c7fd89cfa5a2e087bb0266a3404525e3f2c (diff) | |
download | nixlib-81686434bfa218ad8713ba2ed4e9ce5b51207851.tar nixlib-81686434bfa218ad8713ba2ed4e9ce5b51207851.tar.gz nixlib-81686434bfa218ad8713ba2ed4e9ce5b51207851.tar.bz2 nixlib-81686434bfa218ad8713ba2ed4e9ce5b51207851.tar.lz nixlib-81686434bfa218ad8713ba2ed4e9ce5b51207851.tar.xz nixlib-81686434bfa218ad8713ba2ed4e9ce5b51207851.tar.zst nixlib-81686434bfa218ad8713ba2ed4e9ce5b51207851.zip |
Merge pull request #42817 from Hodapp87/fix_mesa_glu
appleseed, structure-synth, luxcorerender: libGLU instead of mesa_glu
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/graphics/appleseed/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/graphics/luxcorerender/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/graphics/structure-synth/default.nix | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/tools/graphics/appleseed/default.nix b/pkgs/tools/graphics/appleseed/default.nix index e4b31f06b6e4..56091a89e48b 100644 --- a/pkgs/tools/graphics/appleseed/default.nix +++ b/pkgs/tools/graphics/appleseed/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, boost165, pkgconfig, guile, -eigen3_3, libpng, python, mesa_glu, qt4, openexr, openimageio, +eigen3_3, libpng, python, libGLU, qt4, openexr, openimageio, opencolorio, xercesc, ilmbase, osl, seexpr }: @@ -17,7 +17,7 @@ in stdenv.mkDerivation rec { }; buildInputs = [ cmake pkgconfig boost_static guile eigen3_3 libpng python - mesa_glu qt4 openexr openimageio opencolorio xercesc + libGLU qt4 openexr openimageio opencolorio xercesc osl seexpr ]; diff --git a/pkgs/tools/graphics/luxcorerender/default.nix b/pkgs/tools/graphics/luxcorerender/default.nix index 387c8c0595e7..08d5ff851407 100644 --- a/pkgs/tools/graphics/luxcorerender/default.nix +++ b/pkgs/tools/graphics/luxcorerender/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, boost165, pkgconfig, python35 , tbb, openimageio, libjpeg, libpng, zlib, libtiff, ilmbase , freetype, openexr, libXdmcp, libxkbcommon, epoxy, at-spi2-core -, dbus, doxygen, qt5, c-blosc, mesa_glu, gnome3, pcre +, dbus, doxygen, qt5, c-blosc, libGLU, gnome3, pcre , bison, flex, libpthreadstubs, libX11 , embree2, makeWrapper, gsettings_desktop_schemas, glib , withOpenCL ? true , opencl-headers, ocl-icd, opencl-clhpp @@ -26,7 +26,7 @@ in stdenv.mkDerivation rec { buildInputs = [ embree2 pkgconfig cmake zlib boost_static libjpeg libtiff libpng ilmbase freetype openexr openimageio - tbb qt5.full c-blosc mesa_glu pcre bison + tbb qt5.full c-blosc libGLU pcre bison flex libX11 libpthreadstubs python35 libXdmcp libxkbcommon epoxy at-spi2-core dbus doxygen # needed for GSETTINGS_SCHEMAS_PATH diff --git a/pkgs/tools/graphics/structure-synth/default.nix b/pkgs/tools/graphics/structure-synth/default.nix index 92a7d69aa915..c1e6c2afecce 100644 --- a/pkgs/tools/graphics/structure-synth/default.nix +++ b/pkgs/tools/graphics/structure-synth/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt4, qmake4Hook, unzip, mesa_glu, makeWrapper }: +{ stdenv, fetchurl, qt4, qmake4Hook, unzip, libGLU, makeWrapper }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1kiammx46719az6jzrav8yrwz82nk4m72ybj0kpbnvp9wfl3swbb"; }; - buildInputs = [ qt4 unzip mesa_glu makeWrapper ]; + buildInputs = [ qt4 unzip libGLU makeWrapper ]; nativeBuildInputs = [ qmake4Hook ]; # Thanks to https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=672000#15: |