pyrox.dev
lol
freecad: updating to git master
+7
-15
pkgs/applications/graphics/freecad/default.nix
+7
-15
pkgs/applications/graphics/freecad/default.nix
···
1
-
{ fetchsvn, stdenv, cmake, coin3d, xercesc, ode, eigen, qt4, opencascade, gts,
1
+
{ fetchgit, stdenv, cmake, coin3d, xercesc, ode, eigen, qt4, opencascade, gts,
2
2
boost, zlib,
3
3
python, swig, gfortran, soqt, libf2c, pyqt4, makeWrapper }:
4
4
5
-
# It builds but fails to install
6
-
7
5
stdenv.mkDerivation rec {
8
6
name = "freecad-${version}";
9
-
version = "svn-${src.rev}";
7
+
version = "git-20121213";
10
8
11
-
src = fetchsvn {
12
-
url = https://free-cad.svn.sourceforge.net/svnroot/free-cad/trunk;
13
-
rev = "4184";
14
-
sha256 = "26bd8407ce38f070b81ef39145aed093eed3c200d165a605b8169162d66568ce";
9
+
src = fetchgit {
10
+
url = git://free-cad.git.sourceforge.net/gitroot/free-cad/free-cad;
11
+
rev = "d3949cedc7e3c924d426660515e06eaf55d1a67f";
12
+
sha256 = "0a07ih0z5d8m69zasmvi7z4lgq0pa67k2g7r1l6nz2d0b30py61w";
15
13
};
16
14
17
15
buildInputs = [ cmake coin3d xercesc ode eigen qt4 opencascade gts boost
···
19
17
20
18
enableParallelBuilding = true;
21
19
22
-
# The freecad people are used to boost 1.42, and we have newer boost that
23
-
# require the -DBOOST_FILESYSTEM_VERSION=2 for freecad to build
24
-
# For zlib to build in i686-linux, as g++ plus glibc defines _LARGEFILE64_SOURCE,
25
-
# we need the -D-FILE_OFFSET_BITS=64 indication for zlib headers to work.
26
-
NIX_CFLAGS_COMPILE = "-DBOOST_FILESYSTEM_VERSION=2 -D_FILE_OFFSET_BITS=64";
27
-
28
20
# This should work on both x86_64, and i686 linux
29
21
preBuild = ''
30
22
export NIX_LDFLAGS="-L${gfortran.gcc}/lib64 -L${gfortran.gcc}/lib $NIX_LDFLAGS";
···
35
27
--set COIN_GL_NO_CURRENT_CONTEXT_CHECK 1
36
28
'';
37
29
38
-
patches = [ ./cmakeinstall.patch ./pythonpath.patch ];
30
+
patches = [ ./pythonpath.patch ];
39
31
40
32
meta = {
41
33
homepage = http://free-cad.sourceforge.net/;
+11
-7
pkgs/applications/graphics/freecad/pythonpath.patch
+11
-7
pkgs/applications/graphics/freecad/pythonpath.patch
···
1
-
http://sourceforge.net/apps/phpbb/free-cad/viewtopic.php?f=4&t=847&p=6364
2
-
3
-
Index: src/Main/MainGui.cpp
4
-
===================================================================
5
-
--- a/src/Main/MainGui.cpp (revision 4193)
6
-
+++ a/src/Main/MainGui.cpp (working copy)
7
-
@@ -149,10 +149,10 @@
1
+
diff --git a/src/Main/MainGui.cpp b/src/Main/MainGui.cpp
2
+
index 03407c5..b029384 100644
3
+
--- a/src/Main/MainGui.cpp
4
+
+++ b/src/Main/MainGui.cpp
5
+
@@ -190,15 +190,15 @@ int main( int argc, char ** argv )
8
6
// http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=559846
7
+
putenv("LANG=C");
8
+
putenv("LC_ALL=C");
9
+
- putenv("PYTHONPATH=");
10
+
+ //putenv("PYTHONPATH=");
11
+
#elif defined(FC_OS_MACOSX)
12
+
(void)QLocale::system();
9
13
putenv("LANG=C");
10
14
putenv("LC_ALL=C");
11
15
- putenv("PYTHONPATH=");