opencascade*: fix build after mesa update
This commit is contained in:
parent
33153a2166
commit
0ea7d9b6f9
@ -20,7 +20,9 @@ stdenv.mkDerivation rec {
|
||||
|
||||
# -fpermissive helps building opencascade, although gcc detects a flaw in the code
|
||||
# and reports an error otherwise. Further versions may fix that.
|
||||
NIX_CFLAGS_COMPILE = "-fpermissive";
|
||||
NIX_CFLAGS_COMPILE = "-fpermissive"
|
||||
# https://bugs.freedesktop.org/show_bug.cgi?id=83631
|
||||
+ " -DGLX_GLXEXT_LEGACY";
|
||||
|
||||
configureFlags = [ "--with-tcl=${tcl}/lib" "--with-tk=${tk}/lib" "--with-qt=${qt4}" "--with-ftgl=${ftgl}" "--with-freetype=${freetype}" ];
|
||||
|
||||
|
@ -14,6 +14,9 @@ stdenv.mkDerivation rec {
|
||||
cmakeFlags="$cmakeFlags -DINSTALL_DIR=$out -D3RDPARTY_TCL_DIR=${tcl} -D3RDPARTY_FREETYPE_DIR=${freetype}"
|
||||
'';
|
||||
|
||||
# https://bugs.freedesktop.org/show_bug.cgi?id=83631
|
||||
NIX_CFLAGS_COMPILE = "-DGLX_GLXEXT_LEGACY";
|
||||
|
||||
postInstall = ''
|
||||
mv $out/inc $out/include
|
||||
mkdir -p $out/share/doc/${name}
|
||||
|
@ -14,6 +14,9 @@ stdenv.mkDerivation rec {
|
||||
cmakeFlags="$cmakeFlags -DOCE_INSTALL_PREFIX=$out"
|
||||
'';
|
||||
|
||||
# https://bugs.freedesktop.org/show_bug.cgi?id=83631
|
||||
NIX_CFLAGS_COMPILE = "-DGLX_GLXEXT_LEGACY";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = {
|
||||
|
Loading…
Reference in New Issue
Block a user