tangled
alpha
login
or
join now
tjh.dev
/
nixpkgs
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
0
fork
atom
overview
issues
pulls
pipelines
opencascade*: fix build after mesa update
Vladimír Čunát
11 years ago
0ea7d9b6
33153a21
+9
-1
3 changed files
expand all
collapse all
unified
split
pkgs
development
libraries
opencascade
6.5.nix
default.nix
oce.nix
+3
-1
pkgs/development/libraries/opencascade/6.5.nix
···
20
20
21
21
# -fpermissive helps building opencascade, although gcc detects a flaw in the code
22
22
# and reports an error otherwise. Further versions may fix that.
23
23
-
NIX_CFLAGS_COMPILE = "-fpermissive";
23
23
+
NIX_CFLAGS_COMPILE = "-fpermissive"
24
24
+
# https://bugs.freedesktop.org/show_bug.cgi?id=83631
25
25
+
+ " -DGLX_GLXEXT_LEGACY";
24
26
25
27
configureFlags = [ "--with-tcl=${tcl}/lib" "--with-tk=${tk}/lib" "--with-qt=${qt4}" "--with-ftgl=${ftgl}" "--with-freetype=${freetype}" ];
26
28
+3
pkgs/development/libraries/opencascade/default.nix
···
14
14
cmakeFlags="$cmakeFlags -DINSTALL_DIR=$out -D3RDPARTY_TCL_DIR=${tcl} -D3RDPARTY_FREETYPE_DIR=${freetype}"
15
15
'';
16
16
17
17
+
# https://bugs.freedesktop.org/show_bug.cgi?id=83631
18
18
+
NIX_CFLAGS_COMPILE = "-DGLX_GLXEXT_LEGACY";
19
19
+
17
20
postInstall = ''
18
21
mv $out/inc $out/include
19
22
mkdir -p $out/share/doc/${name}
+3
pkgs/development/libraries/opencascade/oce.nix
···
14
14
cmakeFlags="$cmakeFlags -DOCE_INSTALL_PREFIX=$out"
15
15
'';
16
16
17
17
+
# https://bugs.freedesktop.org/show_bug.cgi?id=83631
18
18
+
NIX_CFLAGS_COMPILE = "-DGLX_GLXEXT_LEGACY";
19
19
+
17
20
enableParallelBuilding = true;
18
21
19
22
meta = {