fix python includes
svn path=/nixpkgs/trunk/; revision=4419
This commit is contained in:
parent
0ea291d760
commit
7e6f127abb
@ -2,10 +2,12 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = "kudzu-1.2.16";
|
name = "kudzu-1.2.16";
|
||||||
|
builder = ./builder.sh;
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = http://losser.labs.cs.uu.nl/~armijn/.nix/kudzu-1.2.16.tar.gz;
|
url = http://losser.labs.cs.uu.nl/~armijn/.nix/kudzu-1.2.16.tar.gz;
|
||||||
md5 = "5fc786dd558064fd9c9cb3e5be10e799";
|
md5 = "5fc786dd558064fd9c9cb3e5be10e799";
|
||||||
};
|
};
|
||||||
buildInputs = [pciutils python popt gettext];
|
buildInputs = [pciutils python popt gettext];
|
||||||
|
inherit python;
|
||||||
patches = [./kudzu-python.patch];
|
patches = [./kudzu-python.patch];
|
||||||
}
|
}
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
diff -ruN kudzu-1.2.16/Makefile kudzu-1.2.16.new/Makefile
|
diff -ruN kudzu-1.2.16/Makefile kudzu-1.2.16.new/Makefile
|
||||||
--- kudzu-1.2.16/Makefile 2005-10-28 21:57:55.000000000 +0200
|
--- kudzu-1.2.16/Makefile 2005-10-28 21:57:55.000000000 +0200
|
||||||
+++ kudzu-1.2.16.new/Makefile 2005-12-23 16:30:37.000000000 +0100
|
+++ kudzu-1.2.16.new/Makefile 2005-12-23 19:55:12.000000000 +0100
|
||||||
@@ -17,7 +17,7 @@
|
@@ -17,7 +17,7 @@
|
||||||
|
|
||||||
CVSTAG = kudzu-r$(subst .,-,$(VERSION))
|
CVSTAG = kudzu-r$(subst .,-,$(VERSION))
|
||||||
@ -10,3 +10,12 @@ diff -ruN kudzu-1.2.16/Makefile kudzu-1.2.16.new/Makefile
|
|||||||
|
|
||||||
CFLAGS += -I. -DVERSION=\"$(VERSION)\"
|
CFLAGS += -I. -DVERSION=\"$(VERSION)\"
|
||||||
|
|
||||||
|
@@ -84,7 +84,7 @@
|
||||||
|
for ver in $(PYTHONVERS) ; do \
|
||||||
|
if [ ! -f "$$ver/_kudzumodule.so" -o libkudzu.a -nt "$$ver/_kudzumodule.so" ]; then \
|
||||||
|
mkdir -p $$ver ;\
|
||||||
|
- $(CC) $(CFLAGS) -I/usr/include/$$ver -fpic -c -o $$ver/kudzumodule.o kudzumodule.c ;\
|
||||||
|
+ $(CC) $(CFLAGS) -I$(python)/include/$$ver -fpic -c -o $$ver/kudzumodule.o kudzumodule.c ;\
|
||||||
|
$(CC) -o $$ver/_kudzumodule.so $$ver/kudzumodule.o -shared -Wl,-soname,_kudzumodule.so -L. -lkudzu -lpci ;\
|
||||||
|
fi ; \
|
||||||
|
done
|
||||||
|
Loading…
x
Reference in New Issue
Block a user