From d7528deba02de7546f8840ab37012c98715b0726 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 11 Nov 2008 13:07:09 +0000 Subject: [PATCH] More Io binding dependencies.. svn path=/nixpkgs/trunk/; revision=13246 --- pkgs/development/interpreters/io/default.nix | 5 ++++- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/io/default.nix b/pkgs/development/interpreters/io/default.nix index 6e604d22df7..6bbf8aeba05 100644 --- a/pkgs/development/interpreters/io/default.nix +++ b/pkgs/development/interpreters/io/default.nix @@ -8,7 +8,7 @@ let buildInputs = with args; [ zlib sqlite gmp libffi cairo ncurses freetype mesa libpng libtiff libjpeg readline libsndfile libxml2 - freeglut e2fsprogs libsamplerate pcre + freeglut e2fsprogs libsamplerate pcre libevent editline ]; in rec { @@ -30,7 +30,10 @@ rec { preBuild = FullDepEntry ('' for i in $pkgs ${ if args.stdenv ? glibc then args.stdenv.glibc else "" + } ${ + if args ? libffi && args.libffi != null then "$(echo ${args.libffi}/lib/*/include/..)" else "" }; do + echo "Path: $i" sed -i build/AddonBuilder.io -e '/"\/sw"/asearchPrefixes append("'"$i"'"); ' done '') ["minInit" "addInputs" "doUnpack"]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c0cb39c6183..268ad89633b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1982,7 +1982,7 @@ let io = builderDefsPackage (import ../development/interpreters/io) { inherit sqlite zlib gmp libffi cairo ncurses freetype mesa libpng libtiff libjpeg readline libsndfile libxml2 - freeglut e2fsprogs libsamplerate pcre; + freeglut e2fsprogs libsamplerate pcre libevent editline; }; kaffe = import ../development/interpreters/kaffe {