JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #42817 from Hodapp87/fix_mesa_glu

Browse Source 
appleseed, structure-synth, luxcorerender: libGLU instead of mesa_glu
This commit is contained in:
Matthew Bauer 2018-07-05 22:14:08 -04:00 committed by GitHub
commit 81686434bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/compilers/seexpr/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, cmake, libpng, zlib, qt4,
bison, flex, mesa_glu, pythonPackages
bison, flex, libGLU, pythonPackages
}:
stdenv.mkDerivation rec {
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "0a44k56jf6dl36fwgg4zpc252wq5lf9cblg74mp73k82hxw439l4";
};
buildInputs = [ cmake mesa_glu libpng zlib qt4 pythonPackages.pyqt4 bison flex ];
buildInputs = [ cmake libGLU libpng zlib qt4 pythonPackages.pyqt4 bison flex ];
meta = with stdenv.lib; {
description = "Embeddable expression evaluation engine from Disney Animation";
homepage = https://www.disneyanimation.com/technology/seexpr.html;

4
pkgs/tools/graphics/appleseed/default.nix
View File

@ -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
];

4
pkgs/tools/graphics/luxcorerender/default.nix
View File

@ -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

4
pkgs/tools/graphics/structure-synth/default.nix
View File

@ -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: