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

Merge pull request #18324 from tohl/master

Browse Source 
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
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/compilers/ecl/default.nix
View File

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