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

mkcl: 1.1.9 -> 1.1.10.2017-11-14

Browse Source 
Fixes the build with glibc 2.26 (#31696).
This commit is contained in:
Orivej Desh 2017-11-15 17:09:18 +00:00
parent a165a383a2
commit 35e52ffd1f
1 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
pkgs/development/compilers/mkcl/default.nix
View File

@ -1,16 +1,18 @@
{ stdenv, fetchgit, makeWrapper, gmp, gcc }: { stdenv, fetchFromGitHub, makeWrapper, gmp, gcc }:
stdenv.mkDerivation rec { with stdenv.lib; stdenv.mkDerivation rec {
v = "1.1.9"; name = "mkcl-${version}";
name = "mkcl-${v}"; version = "1.1.10.2017-11-14";
src = fetchgit { src = fetchFromGitHub {
url = "https://github.com/jcbeaudoin/mkcl.git"; owner = "jcbeaudoin";
rev = "86768cc1dfc2cc9caa1fe9696584bb25ea6c1429"; repo = "mkcl";
sha256 = "1gsvjp9xlnjccg0idi8x8gzkn6hlrqia95jh3zx7snm894503mf1"; rev = "d3f5afe945907153db2be5a17a419966f83d7653";
sha256 = "1jfmnh96b5dy1874a9y843vihd14ya4by46rb4h5izldp6x3j3kl";
}; };
buildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
propagatedBuildInputs = [ gmp ]; propagatedBuildInputs = [ gmp ];
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];
@ -20,16 +22,27 @@ stdenv.mkDerivation rec {
"GMP_LDFLAGS=-L${gmp.out}/lib" "GMP_LDFLAGS=-L${gmp.out}/lib"
]; ];
# tinycc configure flags copied from the tinycc derivation.
postConfigure = ''(
cd contrib/tinycc
./configure --cc=cc \
--elfinterp=$(< $NIX_CC/nix-support/dynamic-linker) \
--crtprefix=${getLib stdenv.cc.libc}/lib \
--sysincludepaths=${getDev stdenv.cc.libc}/include:{B}/include \
--libpaths=${getLib stdenv.cc.libc}/lib
)'';
postInstall = '' postInstall = ''
wrapProgram $out/bin/mkcl --prefix PATH : "${gcc}/bin" wrapProgram $out/bin/mkcl --prefix PATH : "${gcc}/bin"
''; '';
enableParallelBuilding = true;
meta = { meta = {
description = "ANSI Common Lisp Implementation"; description = "ANSI Common Lisp Implementation";
homepage = https://common-lisp.net/project/mkcl/; homepage = https://common-lisp.net/project/mkcl/;
license = stdenv.lib.licenses.lgpl2Plus; license = licenses.lgpl2Plus;
platforms = stdenv.lib.platforms.linux; platforms = platforms.linux;
maintainers = [stdenv.lib.maintainers.tohl]; maintainers = with maintainers; [ tohl ];
}; };
} }