From b810381cceb45fd6cca14dd5895c6aad0c747a33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Thu, 30 May 2013 19:26:15 +0200
Subject: [PATCH] Ouch. I rolled back the default opencascade by error.
---
.../libraries/opencascade/default.nix | 26 ++++++-------------
1 file changed, 8 insertions(+), 18 deletions(-)
diff --git a/pkgs/development/libraries/opencascade/default.nix b/pkgs/development/libraries/opencascade/default.nix
index 7cc47a30eb70..1ce38ab7b3cf 100644
--- a/pkgs/development/libraries/opencascade/default.nix
+++ b/pkgs/development/libraries/opencascade/default.nix
@@ -1,33 +1,23 @@
-{stdenv, fetchurl, mesa, tcl, tk, file, libXmu, automake, autoconf, libtool, qt4,
-ftgl, freetype}:
+{stdenv, fetchurl, mesa, tcl, tk, file, libXmu, cmake, qt4, freetype}:
stdenv.mkDerivation rec {
- name = "opencascade-6.5.4";
+ name = "opencascade-6.6.0";
src = fetchurl {
- url = http://files.opencascade.com/OCCT/OCC_6.5.4_release/OpenCASCADE654.tar.gz;
- sha256 = "1di08mc0wly4cdi3rh9kj52bk0bfpyk6dy03c9yfnv04i7z03kmy";
+ url = http://files.opencascade.com/OCCT/OCC_6.6.0_release/OpenCASCADE660.tgz;
+ sha256 = "0q2xn915w9skv9sj74lxnyv9g3b0yi1j04majyzxk6sv4nra97z3";
};
- buildInputs = [ mesa tcl tk file libXmu automake autoconf libtool qt4 ftgl freetype ];
+ buildInputs = [ cmake mesa tcl tk file libXmu qt4 freetype ];
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 = ''
mv $out/inc $out/include
mkdir -p $out/share/doc/${name}
- cp -R ../doc $out/share/doc/${name}
+ cp -R ../../../doc $out/share/doc/${name}
'';
enableParallelBuilding = true;