diff options
| author | Armijn Hemel <armijn@gpl-violations.org> | 2005-12-23 18:56:33 +0000 |
|---|---|---|
| committer | Armijn Hemel <armijn@gpl-violations.org> | 2005-12-23 18:56:33 +0000 |
| commit | 7e6f127abb03421f192d0bf40de6634d1d3457d5 (patch) | |
| tree | db4f72b0eebfd91e9fb7d190871fd7acd05455ac /pkgs/os-specific/linux/kudzu | |
| parent | 0ea291d760e658ff588b7ce595b236b1794c8cbf (diff) | |
fix python includes
svn path=/nixpkgs/trunk/; revision=4419
Diffstat (limited to 'pkgs/os-specific/linux/kudzu')
| -rw-r--r-- | pkgs/os-specific/linux/kudzu/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kudzu/kudzu-python.patch | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/kudzu/default.nix b/pkgs/os-specific/linux/kudzu/default.nix index 0571bbbbd0172..5cc8161bd94e7 100644 --- a/pkgs/os-specific/linux/kudzu/default.nix +++ b/pkgs/os-specific/linux/kudzu/default.nix @@ -2,10 +2,12 @@ stdenv.mkDerivation { name = "kudzu-1.2.16"; + builder = ./builder.sh; src = fetchurl { url = http://losser.labs.cs.uu.nl/~armijn/.nix/kudzu-1.2.16.tar.gz; md5 = "5fc786dd558064fd9c9cb3e5be10e799"; }; buildInputs = [pciutils python popt gettext]; + inherit python; patches = [./kudzu-python.patch]; } diff --git a/pkgs/os-specific/linux/kudzu/kudzu-python.patch b/pkgs/os-specific/linux/kudzu/kudzu-python.patch index 7728ddb6e79a3..553d998f51761 100644 --- a/pkgs/os-specific/linux/kudzu/kudzu-python.patch +++ b/pkgs/os-specific/linux/kudzu/kudzu-python.patch @@ -1,6 +1,6 @@ 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.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 @@ 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)\" +@@ -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 |