mkcl: cleanup

This commit is contained in:
Sandro Jäckel 2021-07-30 10:27:09 +02:00
parent e448b1c8be
commit 143a5cf7ad
No known key found for this signature in database
GPG key ID: 3AF5A43A3EECC2E5

View file

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper, gmp, gcc }: { lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper, gmp, gcc }:
with lib; stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mkcl"; pname = "mkcl";
version = "1.1.11"; version = "1.1.11";
@ -27,7 +27,7 @@ with lib; stdenv.mkDerivation rec {
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];
configureFlags = [ configureFlags = [
"GMP_CFLAGS=-I${gmp.dev}/include" "GMP_CFLAGS=-I${lib.getDev gmp}/include"
"GMP_LDFLAGS=-L${gmp.out}/lib" "GMP_LDFLAGS=-L${gmp.out}/lib"
]; ];
@ -36,9 +36,9 @@ with lib; stdenv.mkDerivation rec {
cd contrib/tinycc cd contrib/tinycc
./configure --cc=cc \ ./configure --cc=cc \
--elfinterp=$(< $NIX_CC/nix-support/dynamic-linker) \ --elfinterp=$(< $NIX_CC/nix-support/dynamic-linker) \
--crtprefix=${getLib stdenv.cc.libc}/lib \ --crtprefix=${lib.getLib stdenv.cc.libc}/lib \
--sysincludepaths=${getDev stdenv.cc.libc}/include:{B}/include \ --sysincludepaths=${lib.getDev stdenv.cc.libc}/include:{B}/include \
--libpaths=${getLib stdenv.cc.libc}/lib --libpaths=${lib.getLib stdenv.cc.libc}/lib
)''; )'';
postInstall = '' postInstall = ''
@ -47,7 +47,7 @@ with lib; stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
meta = { meta = with lib; {
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 = licenses.lgpl2Plus; license = licenses.lgpl2Plus;