public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

freecad: updating to git master

This commit is contained in:
Lluís Batlle i Rossell 2012-12-13 12:37:52 +01:00
parent 543bc8c984
commit 465f4f4e3e
3 changed files with 18 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/applications/graphics/freecad/default.nix
View File

@ -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, boost, zlib,
python, swig, gfortran, soqt, libf2c, pyqt4, makeWrapper }: python, swig, gfortran, soqt, libf2c, pyqt4, makeWrapper }:
# It builds but fails to install
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "freecad-${version}"; name = "freecad-${version}";
version = "svn-${src.rev}"; version = "git-20121213";
src = fetchsvn { src = fetchgit {
url = https://free-cad.svn.sourceforge.net/svnroot/free-cad/trunk; url = git://free-cad.git.sourceforge.net/gitroot/free-cad/free-cad;
rev = "4184"; rev = "d3949cedc7e3c924d426660515e06eaf55d1a67f";
sha256 = "26bd8407ce38f070b81ef39145aed093eed3c200d165a605b8169162d66568ce"; sha256 = "0a07ih0z5d8m69zasmvi7z4lgq0pa67k2g7r1l6nz2d0b30py61w";
}; };
buildInputs = [ cmake coin3d xercesc ode eigen qt4 opencascade gts boost buildInputs = [ cmake coin3d xercesc ode eigen qt4 opencascade gts boost
@ -19,12 +17,6 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; 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 # This should work on both x86_64, and i686 linux
preBuild = '' preBuild = ''
export NIX_LDFLAGS="-L${gfortran.gcc}/lib64 -L${gfortran.gcc}/lib $NIX_LDFLAGS"; 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 --set COIN_GL_NO_CURRENT_CONTEXT_CHECK 1
''; '';
patches = [ ./cmakeinstall.patch ./pythonpath.patch ]; patches = [ ./pythonpath.patch ];
meta = { meta = {
homepage = http://free-cad.sourceforge.net/; homepage = http://free-cad.sourceforge.net/;

18
pkgs/applications/graphics/freecad/pythonpath.patch
View File

@ -1,14 +1,18 @@
http://sourceforge.net/apps/phpbb/free-cad/viewtopic.php?f=4&t=847&p=6364 diff --git a/src/Main/MainGui.cpp b/src/Main/MainGui.cpp
index 03407c5..b029384 100644
Index: src/Main/MainGui.cpp --- a/src/Main/MainGui.cpp
=================================================================== +++ b/src/Main/MainGui.cpp
--- a/src/Main/MainGui.cpp (revision 4193) @@ -190,15 +190,15 @@ int main( int argc, char ** argv )
+++ a/src/Main/MainGui.cpp (working copy)
@@ -149,10 +149,10 @@
// http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=559846 // http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=559846
putenv("LANG=C"); putenv("LANG=C");
putenv("LC_ALL=C"); putenv("LC_ALL=C");
- putenv("PYTHONPATH="); - putenv("PYTHONPATH=");
+ //putenv("PYTHONPATH=");
#elif defined(FC_OS_MACOSX)
(void)QLocale::system();
putenv("LANG=C");
putenv("LC_ALL=C");
- putenv("PYTHONPATH=");
+ //putenv("PYTHONPATH="); + //putenv("PYTHONPATH=");
#else #else
setlocale(LC_NUMERIC, "C"); setlocale(LC_NUMERIC, "C");

1
pkgs/top-level/all-packages.nix
View File

@ -7020,7 +7020,6 @@ let
}; };
freecad = callPackage ../applications/graphics/freecad { freecad = callPackage ../applications/graphics/freecad {
boost = boost146;
}; };
freemind = callPackage ../applications/misc/freemind { freemind = callPackage ../applications/misc/freemind {