about summary refs log tree commit diff
path: root/pkgs/development/libraries/opencascade
diff options
context:
space:
mode:
authorLluís Batlle i Rossell <viric@viric.name>2012-12-11 09:52:37 +0100
committerLluís Batlle i Rossell <viric@viric.name>2012-12-11 09:53:26 +0100
commiteee3a373cf1b364e293231c6672f1cc1b2b9d0d3 (patch)
tree246172bd6cec48f3a2583957633b25f053d447ad /pkgs/development/libraries/opencascade
parentd190975896e25f0ea9371e9ce7f1922fbfe01daa (diff)
downloadnixlib-eee3a373cf1b364e293231c6672f1cc1b2b9d0d3.tar
nixlib-eee3a373cf1b364e293231c6672f1cc1b2b9d0d3.tar.gz
nixlib-eee3a373cf1b364e293231c6672f1cc1b2b9d0d3.tar.bz2
nixlib-eee3a373cf1b364e293231c6672f1cc1b2b9d0d3.tar.lz
nixlib-eee3a373cf1b364e293231c6672f1cc1b2b9d0d3.tar.xz
nixlib-eee3a373cf1b364e293231c6672f1cc1b2b9d0d3.tar.zst
nixlib-eee3a373cf1b364e293231c6672f1cc1b2b9d0d3.zip
opencascade: update to 6.5.4
For GL programs, it has this new requirement:
export CSF_GraphicShr=$CASROOT/lib/libTKOpenGl.so

http://www.salome-platform.org/forum/forum_10/thread_2350
Diffstat (limited to 'pkgs/development/libraries/opencascade')
-rw-r--r--pkgs/development/libraries/opencascade/default.nix10
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/libraries/opencascade/default.nix b/pkgs/development/libraries/opencascade/default.nix
index 375aa4f2d58f..7cc47a30eb70 100644
--- a/pkgs/development/libraries/opencascade/default.nix
+++ b/pkgs/development/libraries/opencascade/default.nix
@@ -2,10 +2,10 @@
 ftgl, freetype}:
 
 stdenv.mkDerivation rec {
-  name = "opencascade-6.5.2";
+  name = "opencascade-6.5.4";
   src = fetchurl {
-    url = http://files.opencascade.com/OCCT/OCC_6.5.2_release/OpenCASCADE652.tar.gz;
-    sha256 = "0nsfjhd6rv1fmq8jbyzcs0f13h4xfld487vqs9bwd4lbwcfqxwcy";
+    url = http://files.opencascade.com/OCCT/OCC_6.5.4_release/OpenCASCADE654.tar.gz;
+    sha256 = "1di08mc0wly4cdi3rh9kj52bk0bfpyk6dy03c9yfnv04i7z03kmy";
   };
 
   buildInputs = [ mesa tcl tk file libXmu automake autoconf libtool qt4 ftgl freetype ];
@@ -20,9 +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 = "-I${ftgl}/include/FTGL -I${freetype}/include/freetype2 -fpermissive";
+  NIX_CFLAGS_COMPILE = "-fpermissive";
 
-  configureFlags = [ "--with-tcl=${tcl}/lib" "--with-tk=${tk}/lib" ];
+  configureFlags = [ "--with-tcl=${tcl}/lib" "--with-tk=${tk}/lib" "--with-qt=${qt4}" "--with-ftgl=${ftgl}" "--with-freetype=${freetype}" ];
 
   postInstall = ''
     mv $out/inc $out/include