diff options
Diffstat (limited to 'pkgs/applications/graphics/freecad/default.nix')
-rw-r--r-- | pkgs/applications/graphics/freecad/default.nix | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix index cfe97e12476..c681bc415e3 100644 --- a/pkgs/applications/graphics/freecad/default.nix +++ b/pkgs/applications/graphics/freecad/default.nix @@ -1,17 +1,15 @@ -{ fetchsvn, stdenv, cmake, coin3d, xercesc, ode, eigen, qt4, opencascade, gts, +{ fetchgit, stdenv, cmake, coin3d, xercesc, ode, eigen, qt4, opencascade, gts, boost, zlib, python, swig, gfortran, soqt, libf2c, pyqt4, makeWrapper }: -# It builds but fails to install - stdenv.mkDerivation rec { name = "freecad-${version}"; - version = "svn-${src.rev}"; + version = "git-20121213"; - src = fetchsvn { - url = https://free-cad.svn.sourceforge.net/svnroot/free-cad/trunk; - rev = "4184"; - sha256 = "26bd8407ce38f070b81ef39145aed093eed3c200d165a605b8169162d66568ce"; + src = fetchgit { + url = git://free-cad.git.sourceforge.net/gitroot/free-cad/free-cad; + rev = "d3949cedc7e3c924d426660515e06eaf55d1a67f"; + sha256 = "0a07ih0z5d8m69zasmvi7z4lgq0pa67k2g7r1l6nz2d0b30py61w"; }; buildInputs = [ cmake coin3d xercesc ode eigen qt4 opencascade gts boost @@ -19,12 +17,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - # The freecad people are used to boost 1.42, and we have newer boost that - # require the -DBOOST_FILESYSTEM_VERSION=2 for freecad to build - # For zlib to build in i686-linux, as g++ plus glibc defines _LARGEFILE64_SOURCE, - # we need the -D-FILE_OFFSET_BITS=64 indication for zlib headers to work. - NIX_CFLAGS_COMPILE = "-DBOOST_FILESYSTEM_VERSION=2 -D_FILE_OFFSET_BITS=64"; - # This should work on both x86_64, and i686 linux preBuild = '' export NIX_LDFLAGS="-L${gfortran.gcc}/lib64 -L${gfortran.gcc}/lib $NIX_LDFLAGS"; @@ -35,7 +27,7 @@ stdenv.mkDerivation rec { --set COIN_GL_NO_CURRENT_CONTEXT_CHECK 1 ''; - patches = [ ./cmakeinstall.patch ./pythonpath.patch ]; + patches = [ ./pythonpath.patch ]; meta = { homepage = http://free-cad.sourceforge.net/; |