diff options
author | Lluís Batlle i Rossell <viric@viric.name> | 2014-08-01 13:50:09 +0200 |
---|---|---|
committer | Lluís Batlle i Rossell <viric@viric.name> | 2014-08-01 16:56:27 +0200 |
commit | 5e35fef0eb7f303f2589f1dc48f297ea2c2767fd (patch) | |
tree | f58f5cb14667d1e3404345cf25b3e9d995538b99 /pkgs/applications | |
parent | 688824cc60838c504eb7ea7ac47e9cfbc38e13d1 (diff) | |
download | nixlib-5e35fef0eb7f303f2589f1dc48f297ea2c2767fd.tar nixlib-5e35fef0eb7f303f2589f1dc48f297ea2c2767fd.tar.gz nixlib-5e35fef0eb7f303f2589f1dc48f297ea2c2767fd.tar.bz2 nixlib-5e35fef0eb7f303f2589f1dc48f297ea2c2767fd.tar.lz nixlib-5e35fef0eb7f303f2589f1dc48f297ea2c2767fd.tar.xz nixlib-5e35fef0eb7f303f2589f1dc48f297ea2c2767fd.tar.zst nixlib-5e35fef0eb7f303f2589f1dc48f297ea2c2767fd.zip |
freecad: updating to 0.14
I had to update all the pyside programs, or freecad failed to build. I picked the versions advertised in http://qt-project.org/wiki/PySideDownloads . The rest I took for github latest releases.
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/graphics/freecad/default.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix index 770a7ee8212b..2f20291e2703 100644 --- a/pkgs/applications/graphics/freecad/default.nix +++ b/pkgs/applications/graphics/freecad/default.nix @@ -1,19 +1,19 @@ { stdenv, fetchurl, cmake, coin3d, xercesc, ode, eigen, qt4, opencascade, gts , boost, zlib, python, swig, gfortran, soqt, libf2c , pyqt4, makeWrapper -, matplotlib, pycollada }: +, matplotlib, pycollada, pyside, pysideShiboken }: stdenv.mkDerivation rec { name = "freecad-${version}"; - version = "0.13.1830"; + version = "0.14.3702"; src = fetchurl { url = "mirror://sourceforge/free-cad/${name}.tar.gz"; - sha256 = "04rgww5y32asn4sx5j4wh79ggvb479pq56xfcfj6gkg44mid23jm"; + sha256 = "1jcx7d3mp2wxkd20qdvr4vlf7h5wb0jgab9dl63sicdz88swy97f"; }; buildInputs = [ cmake coin3d xercesc ode eigen qt4 opencascade gts boost zlib python swig gfortran soqt libf2c pyqt4 makeWrapper matplotlib - pycollada + pycollada pyside pysideShiboken ]; enableParallelBuilding = true; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { --set COIN_GL_NO_CURRENT_CONTEXT_CHECK 1 ''; - patches = [ ./pythonpath.patch ./cmake.patch ]; + patches = [ ./pythonpath.patch ]; meta = { homepage = http://free-cad.sourceforge.net/; |