lol

mkcl: 1.1.9 -> 1.1.10.2017-11-14

Fixes the build with glibc 2.26 (#31696).

+26 -13
+26 -13
pkgs/development/compilers/mkcl/default.nix
··· 1 - { stdenv, fetchgit, makeWrapper, gmp, gcc }: 1 + { stdenv, fetchFromGitHub, makeWrapper, gmp, gcc }: 2 2 3 - stdenv.mkDerivation rec { 4 - v = "1.1.9"; 5 - name = "mkcl-${v}"; 3 + with stdenv.lib; stdenv.mkDerivation rec { 4 + name = "mkcl-${version}"; 5 + version = "1.1.10.2017-11-14"; 6 6 7 - src = fetchgit { 8 - url = "https://github.com/jcbeaudoin/mkcl.git"; 9 - rev = "86768cc1dfc2cc9caa1fe9696584bb25ea6c1429"; 10 - sha256 = "1gsvjp9xlnjccg0idi8x8gzkn6hlrqia95jh3zx7snm894503mf1"; 7 + src = fetchFromGitHub { 8 + owner = "jcbeaudoin"; 9 + repo = "mkcl"; 10 + rev = "d3f5afe945907153db2be5a17a419966f83d7653"; 11 + sha256 = "1jfmnh96b5dy1874a9y843vihd14ya4by46rb4h5izldp6x3j3kl"; 11 12 }; 12 13 13 - buildInputs = [ makeWrapper ]; 14 + nativeBuildInputs = [ makeWrapper ]; 15 + 14 16 propagatedBuildInputs = [ gmp ]; 15 17 16 18 hardeningDisable = [ "format" ]; ··· 20 22 "GMP_LDFLAGS=-L${gmp.out}/lib" 21 23 ]; 22 24 25 + # tinycc configure flags copied from the tinycc derivation. 26 + postConfigure = ''( 27 + cd contrib/tinycc 28 + ./configure --cc=cc \ 29 + --elfinterp=$(< $NIX_CC/nix-support/dynamic-linker) \ 30 + --crtprefix=${getLib stdenv.cc.libc}/lib \ 31 + --sysincludepaths=${getDev stdenv.cc.libc}/include:{B}/include \ 32 + --libpaths=${getLib stdenv.cc.libc}/lib 33 + )''; 34 + 23 35 postInstall = '' 24 36 wrapProgram $out/bin/mkcl --prefix PATH : "${gcc}/bin" 25 37 ''; 26 38 39 + enableParallelBuilding = true; 40 + 27 41 meta = { 28 42 description = "ANSI Common Lisp Implementation"; 29 43 homepage = https://common-lisp.net/project/mkcl/; 30 - license = stdenv.lib.licenses.lgpl2Plus; 31 - platforms = stdenv.lib.platforms.linux; 32 - maintainers = [stdenv.lib.maintainers.tohl]; 44 + license = licenses.lgpl2Plus; 45 + platforms = platforms.linux; 46 + maintainers = with maintainers; [ tohl ]; 33 47 }; 34 48 } 35 -