Merge remote-tracking branch 'upstream/master' into hardened-stdenv

pkgs/development/compilers/ecl/default.nix

@@ -1,6 +1,6 @@
 {stdenv, fetchurl
 , libtool, autoconf, automake
-, gmp, mpfr, libffi
+, gmp, mpfr, libffi, makeWrapper
 , noUnicode ? false, 
 }:
 let
@@ -14,7 +14,7 @@ let
     sha256="16ab8qs3awvdxy8xs8jy82v8r04x4wr70l9l2j45vgag18d2nj1d";
   };
   buildInputs = [
-    libtool autoconf automake
+    libtool autoconf automake makeWrapper
   ];
   propagatedBuildInputs = [
     libffi gmp mpfr
@@ -42,6 +42,9 @@ stdenv.mkDerivation {
 
   postInstall = ''
     sed -e 's/@[-a-zA-Z_]*@//g' -i $out/bin/ecl-config
+    wrapProgram "$out/bin/ecl" \
+      --prefix NIX_LDFLAGS ' ' "-L${gmp.lib or gmp.out or gmp}/lib" \
+      --prefix NIX_LDFLAGS ' ' "-L${libffi.lib or libffi.out or libffi}/lib"
   '';
 
   meta = {