Ouch. I rolled back the default opencascade by error.
This commit is contained in:
parent
270f861dde
commit
b810381cce
@ -1,33 +1,23 @@
|
|||||||
{stdenv, fetchurl, mesa, tcl, tk, file, libXmu, automake, autoconf, libtool, qt4,
|
{stdenv, fetchurl, mesa, tcl, tk, file, libXmu, cmake, qt4, freetype}:
|
||||||
ftgl, freetype}:
|
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "opencascade-6.5.4";
|
name = "opencascade-6.6.0";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = http://files.opencascade.com/OCCT/OCC_6.5.4_release/OpenCASCADE654.tar.gz;
|
url = http://files.opencascade.com/OCCT/OCC_6.6.0_release/OpenCASCADE660.tgz;
|
||||||
sha256 = "1di08mc0wly4cdi3rh9kj52bk0bfpyk6dy03c9yfnv04i7z03kmy";
|
sha256 = "0q2xn915w9skv9sj74lxnyv9g3b0yi1j04majyzxk6sv4nra97z3";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ mesa tcl tk file libXmu automake autoconf libtool qt4 ftgl freetype ];
|
buildInputs = [ cmake mesa tcl tk file libXmu qt4 freetype ];
|
||||||
|
|
||||||
preUnpack = ''
|
preUnpack = ''
|
||||||
sourceRoot=`pwd`/ros
|
sourceRoot=`pwd`/ros/adm/cmake
|
||||||
|
cmakeFlags="$cmakeFlags -DINSTALL_DIR=$out -D3RDPARTY_TCL_DIR=${tcl} -D3RDPARTY_FREETYPE_DIR=${freetype}"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
preConfigure = ''
|
|
||||||
sh ./build_configure
|
|
||||||
'';
|
|
||||||
|
|
||||||
# -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";
|
|
||||||
|
|
||||||
configureFlags = [ "--with-tcl=${tcl}/lib" "--with-tk=${tk}/lib" "--with-qt=${qt4}" "--with-ftgl=${ftgl}" "--with-freetype=${freetype}" ];
|
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
mv $out/inc $out/include
|
mv $out/inc $out/include
|
||||||
mkdir -p $out/share/doc/${name}
|
mkdir -p $out/share/doc/${name}
|
||||||
cp -R ../doc $out/share/doc/${name}
|
cp -R ../../../doc $out/share/doc/${name}
|
||||||
'';
|
'';
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user