Merge pull request #18324 from tohl/master

ecl: add gcc into wrapper PATH
This commit is contained in:
Michael Raskin 2016-09-05 19:35:09 +00:00 committed by GitHub
commit 06d55c7e27

View File

@ -1,7 +1,8 @@
{stdenv, fetchurl
, libtool, autoconf, automake
, gmp, mpfr, libffi, makeWrapper
, noUnicode ? false,
, noUnicode ? false
, gcc
}:
let
s = # Generated upstream information
@ -17,7 +18,7 @@ let
libtool autoconf automake makeWrapper
];
propagatedBuildInputs = [
libffi gmp mpfr
libffi gmp mpfr gcc
];
in
stdenv.mkDerivation {
@ -43,6 +44,7 @@ stdenv.mkDerivation {
postInstall = ''
sed -e 's/@[-a-zA-Z_]*@//g' -i $out/bin/ecl-config
wrapProgram "$out/bin/ecl" \
--prefix PATH ':' "${gcc}/bin" \
--prefix NIX_LDFLAGS ' ' "-L${gmp.lib or gmp.out or gmp}/lib" \
--prefix NIX_LDFLAGS ' ' "-L${libffi.lib or libffi.out or libffi}/lib"
'';