Author: viric
Date: Sat Mar 5 22:27:51 2011
New Revision: 26169
URL: https://svn.nixos.org/websvn/nix/?rev=26169&sc=1
Log:
Trying to make freecad find pyqt. This required a patch to be able to use
PYTHONPATH.
Added:
nixpkgs/trunk/pkgs/applications/graphics/freecad/pythonpath.patch
Modified:
nixpkgs/trunk/pkgs/applications/graphics/freecad/default.nix
Modified: nixpkgs/trunk/pkgs/applications/graphics/freecad/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/graphics/freecad/default.nix Sat Mar
5 22:05:00 2011 (r26168)
+++ nixpkgs/trunk/pkgs/applications/graphics/freecad/default.nix Sat Mar
5 22:27:51 2011 (r26169)
@@ -1,6 +1,6 @@
{ fetchsvn, stdenv, cmake, coin3d, xercesc, ode, eigen, qt4, opencascade, gts,
boost, zlib,
-python, swig, gfortran, soqt, libf2c }:
+python, swig, gfortran, soqt, libf2c, pyqt4, makeWrapper }:
# It builds but fails to install
@@ -15,7 +15,7 @@
};
buildInputs = [ cmake coin3d xercesc ode eigen qt4 opencascade gts boost
- zlib python swig gfortran soqt libf2c ];
+ zlib python swig gfortran soqt libf2c pyqt4 makeWrapper ];
enableParallelBuilding = true;
@@ -28,7 +28,12 @@
export NIX_LDFLAGS="-L${gfortran.gcc}/lib64 $NIX_LDFLAGS";
'';
- patches = [ ./cmakeinstall.patch ];
+ postInstall = ''
+ wrapProgram $out/bin/FreeCAD --prefix PYTHONPATH : $PYTHONPATH \
+ --set COIN_GL_NO_CURRENT_CONTEXT_CHECK 1
+ '';
+
+ patches = [ ./cmakeinstall.patch ./pythonpath.patch ];
meta = {
homepage = http://free-cad.sourceforge.net/;
Added: nixpkgs/trunk/pkgs/applications/graphics/freecad/pythonpath.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/applications/graphics/freecad/pythonpath.patch Sat Mar
5 22:27:51 2011 (r26169)
@@ -0,0 +1,19 @@
+http://sourceforge.net/apps/phpbb/free-cad/viewtopic.php?f=4&t=847&p=6364
+
+Index: src/Main/MainGui.cpp
+===================================================================
+--- a/src/Main/MainGui.cpp (revision 4193)
++++ a/src/Main/MainGui.cpp (working copy)
+@@ -149,10 +149,10 @@
+ // http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=559846
+ 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
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
