diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-07-30 12:22:16 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-30 12:22:16 +0000 |
| commit | f8c7dd7df7e10aaf50cc8da36a3082b5fc7b05c6 (patch) | |
| tree | b42027ca9c735007973aee5244cb6b5115b301e5 /pkgs | |
| parent | efbb23c88943eeb9d39a051c5ee13cdfd4e52050 (diff) | |
| parent | 143a5cf7ad5b44e0c33dd2ddc6f25497d5351352 (diff) | |
| download | nixpkgs-f8c7dd7df7e10aaf50cc8da36a3082b5fc7b05c6.tar nixpkgs-f8c7dd7df7e10aaf50cc8da36a3082b5fc7b05c6.tar.gz nixpkgs-f8c7dd7df7e10aaf50cc8da36a3082b5fc7b05c6.tar.bz2 nixpkgs-f8c7dd7df7e10aaf50cc8da36a3082b5fc7b05c6.tar.lz nixpkgs-f8c7dd7df7e10aaf50cc8da36a3082b5fc7b05c6.tar.xz nixpkgs-f8c7dd7df7e10aaf50cc8da36a3082b5fc7b05c6.tar.zst nixpkgs-f8c7dd7df7e10aaf50cc8da36a3082b5fc7b05c6.zip | |
Merge pull request #132057 from SuperSandro2000/mkcl
mkcl: cleanup
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/compilers/mkcl/default.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/compilers/mkcl/default.nix b/pkgs/development/compilers/mkcl/default.nix index 181c75c81b0..e8452f46a8a 100644 --- a/pkgs/development/compilers/mkcl/default.nix +++ b/pkgs/development/compilers/mkcl/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper, gmp, gcc }: -with lib; stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "mkcl"; version = "1.1.11"; @@ -27,7 +27,7 @@ with lib; stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; configureFlags = [ - "GMP_CFLAGS=-I${gmp.dev}/include" + "GMP_CFLAGS=-I${lib.getDev gmp}/include" "GMP_LDFLAGS=-L${gmp.out}/lib" ]; @@ -36,9 +36,9 @@ with lib; stdenv.mkDerivation rec { 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 + --crtprefix=${lib.getLib stdenv.cc.libc}/lib \ + --sysincludepaths=${lib.getDev stdenv.cc.libc}/include:{B}/include \ + --libpaths=${lib.getLib stdenv.cc.libc}/lib )''; postInstall = '' @@ -47,7 +47,7 @@ with lib; stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = { + meta = with lib; { description = "ANSI Common Lisp Implementation"; homepage = "https://common-lisp.net/project/mkcl/"; license = licenses.lgpl2Plus; |