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

IceCat: Don't override $PYTHONPATH.

Browse Source 
svn path=/nixpkgs/trunk/; revision=16433
This commit is contained in:
Ludovic Courtès 2009-07-20 14:37:28 +00:00
parent 5fdfa7ddf1
commit 3c7bb6a957
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/networking/browsers/icecat-3/default.nix
View File

@ -20,7 +20,9 @@ stdenv.mkDerivation {
xlibs.libXi xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt
];
patches = [ ./skip-gre-registration.patch ./rpath-link.patch ];
patches = [
./skip-gre-registration.patch ./rpath-link.patch ./pythonpath.patch
];
configureFlags = [
"--enable-application=${application}"

14
pkgs/applications/networking/browsers/icecat-3/pythonpath.patch Normal file
View File

@ -0,0 +1,14 @@
This patch makes sure $PYTHONPATH is not overridden so that the `ply'
Python module is visible.
--- icecat-3.5.1/js/src/xpconnect/src/Makefile.in 2009-07-18 14:33:08.000000000 +0200
+++ icecat-3.5.1/js/src/xpconnect/src/Makefile.in 2009-07-20 16:31:43.000000000 +0200
@@ -209,7 +209,7 @@ dom_quickstubs.h dom_quickstubs.cpp: $(s
$(topsrcdir)/xpcom/idl-parser/header.py \
$(topsrcdir)/xpcom/idl-parser/xpidl.py \
$(DEPTH)/js/src/mozilla-config.h
- PYTHONPATH=$(topsrcdir)/xpcom/idl-parser \
+ PYTHONPATH="$$PYTHONPATH:$(topsrcdir)/xpcom/idl-parser" \
$(PYTHON) $(srcdir)/qsgen.py \
--idlpath=$(DEPTH)/dist/idl \
--cachedir=$(DEPTH)/xpcom/idl-parser \