summary refs log tree commit diff
path: root/pkgs/development/libraries/opencascade
diff options
context:
space:
mode:
authorYury G. Kudryashov <urkud.urkud@gmail.com>2012-03-05 10:00:23 +0000
committerYury G. Kudryashov <urkud.urkud@gmail.com>2012-03-05 10:00:23 +0000
commit57fd764a391a6215165c377e1936204f297905c9 (patch)
treee93f78b2cb4718187f5b693e3655499ee6ba485a /pkgs/development/libraries/opencascade
parenta88fdf8ef7cd09efb795b2b3a7e41ec95bdc457f (diff)
parente657e2c455d17fddd6d79eb93a1d08836a2e2b28 (diff)
downloadnixlib-57fd764a391a6215165c377e1936204f297905c9.tar
nixlib-57fd764a391a6215165c377e1936204f297905c9.tar.gz
nixlib-57fd764a391a6215165c377e1936204f297905c9.tar.bz2
nixlib-57fd764a391a6215165c377e1936204f297905c9.tar.lz
nixlib-57fd764a391a6215165c377e1936204f297905c9.tar.xz
nixlib-57fd764a391a6215165c377e1936204f297905c9.tar.zst
nixlib-57fd764a391a6215165c377e1936204f297905c9.zip
svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32792
Diffstat (limited to 'pkgs/development/libraries/opencascade')
-rw-r--r--pkgs/development/libraries/opencascade/default.nix21
1 files changed, 15 insertions, 6 deletions
diff --git a/pkgs/development/libraries/opencascade/default.nix b/pkgs/development/libraries/opencascade/default.nix
index e03b9409cfa7..87bbd112758b 100644
--- a/pkgs/development/libraries/opencascade/default.nix
+++ b/pkgs/development/libraries/opencascade/default.nix
@@ -1,18 +1,25 @@
-{stdenv, fetchurl, mesa, tcl, tk, file, libXmu}:
+{stdenv, fetchurl, mesa, tcl, tk, file, libXmu, automake, autoconf, libtool, qt4,
+ftgl, freetype}:
 
 stdenv.mkDerivation rec {
-  name = "opencascade-6.3.0";
+  name = "opencascade-6.5.2";
   src = fetchurl {
-    url = http://files.opencascade.com/OCC_6.3_release/OpenCASCADE_src.tgz;
-    md5 = "52778127974cb3141c2827f9d40d1f11";
+    url = http://files.opencascade.com/OCCT/OCC_6.5.2_release/OpenCASCADE652.tar.gz;
+    sha256 = "0nsfjhd6rv1fmq8jbyzcs0f13h4xfld487vqs9bwd4lbwcfqxwcy";
   };
 
-  buildInputs = [ mesa tcl tk file libXmu ];
+  buildInputs = [ mesa tcl tk file libXmu automake autoconf libtool qt4 ftgl freetype ];
+
+  preUnpack = ''
+    sourceRoot=`pwd`/ros
+  '';
 
   preConfigure = ''
-    cd ros
+    sh ./build_configure
   '';
 
+  NIX_CFLAGS_COMPILE = "-I${ftgl}/include/FTGL -I${freetype}/include/freetype2";
+
   configureFlags = [ "--with-tcl=${tcl}/lib" "--with-tk=${tk}/lib" ];
 
   postInstall = ''
@@ -21,6 +28,8 @@ stdenv.mkDerivation rec {
     cp -R ../doc $out/share/doc/${name}
   '';
 
+  enableParallelBuilding = true;
+
   meta = {
     description = "Open CASCADE Technology, libraries for 3D modeling and numerical simulation";
     homepage = http://www.opencascade.org/;