From 5ecce6b94a76bdbae793dd9702fd3fc12d9fcb4c Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sat, 16 Apr 2016 20:36:19 +0300
Subject: [PATCH] treewide: Make explicit that 'dev' output of libffi is used

---
 pkgs/development/compilers/ecl/default.nix      | 2 +-
 pkgs/development/interpreters/pixie/default.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/ecl/default.nix b/pkgs/development/compilers/ecl/default.nix
index eb4544879f6..d4bfc93df93 100644
--- a/pkgs/development/compilers/ecl/default.nix
+++ b/pkgs/development/compilers/ecl/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation {
   configureFlags = [
     "--enable-threads"
     "--with-gmp-prefix=${gmp.dev}"
-    "--with-libffi-prefix=${libffi}"
+    "--with-libffi-prefix=${libffi.dev}"
     ]
     ++
     (stdenv.lib.optional (! noUnicode)
diff --git a/pkgs/development/interpreters/pixie/default.nix b/pkgs/development/interpreters/pixie/default.nix
index 4adaea04ec1..c9b6731ae34 100644
--- a/pkgs/development/interpreters/pixie/default.nix
+++ b/pkgs/development/interpreters/pixie/default.nix
@@ -47,7 +47,7 @@ let
     patchPhase = ''
       (cd pixie-src
        patch -p1 < ${./load_paths.patch}
-       libraryPaths='["${libuv}" "${libedit}" "${libffi}" "${boost.dev}" "${boost.out}" "${zlib}"]'
+       libraryPaths='["${libuv}" "${libedit}" "${libffi.dev}" "${boost.dev}" "${boost.out}" "${zlib}"]'
        export libraryPaths
        substituteAllInPlace ./pixie/ffi-infer.pxi)
     '';