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

More Io binding dependencies..

Browse Source 
svn path=/nixpkgs/trunk/; revision=13246
This commit is contained in:
Michael Raskin 2008-11-11 13:07:09 +00:00
parent ec0aba1ee1
commit d7528deba0
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/interpreters/io/default.nix
View File

@ -8,7 +8,7 @@ let
buildInputs = with args; [ buildInputs = with args; [
zlib sqlite gmp libffi cairo ncurses freetype mesa zlib sqlite gmp libffi cairo ncurses freetype mesa
libpng libtiff libjpeg readline libsndfile libxml2 libpng libtiff libjpeg readline libsndfile libxml2
freeglut e2fsprogs libsamplerate pcre freeglut e2fsprogs libsamplerate pcre libevent editline
]; ];
in in
rec { rec {
@ -30,7 +30,10 @@ rec {
preBuild = FullDepEntry ('' preBuild = FullDepEntry (''
for i in $pkgs ${ for i in $pkgs ${
if args.stdenv ? glibc then args.stdenv.glibc else "" if args.stdenv ? glibc then args.stdenv.glibc else ""
} ${
if args ? libffi && args.libffi != null then "$(echo ${args.libffi}/lib/*/include/..)" else ""
}; do }; do
echo "Path: $i"
sed -i build/AddonBuilder.io -e '/"\/sw"/asearchPrefixes append("'"$i"'"); ' sed -i build/AddonBuilder.io -e '/"\/sw"/asearchPrefixes append("'"$i"'"); '
done done
'') ["minInit" "addInputs" "doUnpack"]; '') ["minInit" "addInputs" "doUnpack"];

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

@ -1982,7 +1982,7 @@ let
io = builderDefsPackage (import ../development/interpreters/io) { io = builderDefsPackage (import ../development/interpreters/io) {
inherit sqlite zlib gmp libffi cairo ncurses freetype mesa inherit sqlite zlib gmp libffi cairo ncurses freetype mesa
libpng libtiff libjpeg readline libsndfile libxml2 libpng libtiff libjpeg readline libsndfile libxml2
freeglut e2fsprogs libsamplerate pcre; freeglut e2fsprogs libsamplerate pcre libevent editline;
}; };
kaffe = import ../development/interpreters/kaffe { kaffe = import ../development/interpreters/kaffe {