Updating freecad to 0.15

(cherry picked from commit 8a18bc8722dc1739b5b2109d556032ca9a068bbd)

Conflicts:
	pkgs/top-level/all-packages.nix

2 files changed, 10 insertions, 30 deletions

diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix
index 57dd49f7eb7..0390021d839 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, makeWrapper
-, matplotlib, pycollada, pyside, pysideShiboken }:
+, matplotlib, pycollada, pyside, pysideTools, pysideShiboken }:
 
 stdenv.mkDerivation rec {
   name = "freecad-${version}";
-  version = "0.14.3702";
+  version = "0.15";
 
   src = fetchurl {
-    url = "mirror://sourceforge/free-cad/${name}.tar.gz";
-    sha256 = "1jcx7d3mp2wxkd20qdvr4vlf7h5wb0jgab9dl63sicdz88swy97f";
+    url = https://github.com/FreeCAD/FreeCAD/archive/0.15.tar.gz;
+    sha256 = "1vndvywvq86hyhmg629bkn5ag4lk2mg1pl4dq7jvbjvbrczb12fc";
   };
 
   buildInputs = [ cmake coin3d xercesc ode eigen qt4 opencascade gts boost
     zlib python swig gfortran soqt libf2c makeWrapper matplotlib
-    pycollada pyside pysideShiboken
+    pycollada pyside pysideShiboken pysideTools
   ];
 
   enableParallelBuilding = true;
@@ -23,13 +23,16 @@ stdenv.mkDerivation rec {
     export NIX_LDFLAGS="-L${gfortran.cc}/lib64 -L${gfortran.cc}/lib $NIX_LDFLAGS";
   '';
 
+  # Their main() removes PYTHONPATH=, and we rely on it.
+  preConfigure = ''
+    sed '/putenv("PYTHONPATH/d' -i src/Main/MainGui.cpp
+  '';
+
   postInstall = ''
     wrapProgram $out/bin/FreeCAD --prefix PYTHONPATH : $PYTHONPATH \
       --set COIN_GL_NO_CURRENT_CONTEXT_CHECK 1
   '';
 
-  patches = [ ./pythonpath.patch ];
-
   meta = with stdenv.lib; {
     description = "General purpose Open Source 3D CAD/MCAD/CAx/CAE/PLM modeler";
     homepage = http://www.freecadweb.org/;
diff --git a/pkgs/applications/graphics/freecad/pythonpath.patch b/pkgs/applications/graphics/freecad/pythonpath.patch
deleted file mode 100644
index 8b09a574807..00000000000
--- a/pkgs/applications/graphics/freecad/pythonpath.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/src/Main/MainGui.cpp b/src/Main/MainGui.cpp
-index 03407c5..b029384 100644
---- a/src/Main/MainGui.cpp
-+++ b/src/Main/MainGui.cpp
-@@ -190,15 +190,15 @@ int main( int argc, char ** argv )
-     // http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=559846

-     putenv("LANG=C");

-     putenv("LC_ALL=C");

--    putenv("PYTHONPATH=");

-+    //putenv("PYTHONPATH=");

- #elif defined(FC_OS_MACOSX)

-     (void)QLocale::system();

-     putenv("LANG=C");

-     putenv("LC_ALL=C");

--    putenv("PYTHONPATH=");

-+    //putenv("PYTHONPATH=");

- #else

-     setlocale(LC_NUMERIC, "C");

--    _putenv("PYTHONPATH=");

-+    //_putenv("PYTHONPATH=");

- #endif

- 

-     // Name and Version of the Application