ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 04:43:09 +03:00
Code Issues Projects Releases Wiki Activity

paraview, vtk: fix build after mesa update

Browse Source
This commit is contained in:
Vladimír Čunát 2015-03-06 12:09:01 +01:00
parent 0ce3dcd91a
commit 33153a2166
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/applications/graphics/paraview/default.nix
View File

@ -29,6 +29,9 @@ stdenv.mkDerivation rec {
"-DPARAVIEW_INSTALL_DEVELOPMENT=ON" "-DPARAVIEW_INSTALL_DEVELOPMENT=ON"
]; ];
# https://bugzilla.redhat.com/show_bug.cgi?id=1138466
NIX_CFLAGS_COMPILE = "-DGLX_GLXEXT_LEGACY";
enableParallelBuilding = true; enableParallelBuilding = true;
buildInputs = [ cmake qt4 hdf5 mpich2 python libxml2 mesa libXt ]; buildInputs = [ cmake qt4 hdf5 mpich2 python libxml2 mesa libXt ];

5
pkgs/development/libraries/vtk/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, cmake, mesa, libX11, xproto, libXt { stdenv, fetchurl, fetchpatch, cmake, mesa, libX11, xproto, libXt
, qtLib ? null }: , qtLib ? null }:
with stdenv.lib; with stdenv.lib;
@ -17,6 +17,9 @@ stdenv.mkDerivation rec {
sha256 = "1fxxgsa7967gdphkl07lbfr6dcbq9a72z5kynlklxn7hyp0l18pi"; sha256 = "1fxxgsa7967gdphkl07lbfr6dcbq9a72z5kynlklxn7hyp0l18pi";
}; };
# https://bugzilla.redhat.com/show_bug.cgi?id=1138466
postPatch = "sed '/^#define GL_GLEXT_LEGACY/d' -i ./Rendering/vtkOpenGL.h";
buildInputs = [ cmake mesa libX11 xproto libXt ] buildInputs = [ cmake mesa libX11 xproto libXt ]
++ optional (qtLib != null) qtLib; ++ optional (qtLib != null) qtLib;