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

Merge pull request #32177 from eraserhd/chez-darwin

Browse Source 
Enable Chez Scheme on Darwin
This commit is contained in:
Daiderd Jordan 2017-11-29 21:08:01 +01:00 committed by GitHub
commit a125946bc1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/development/compilers/chez/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchgit, coreutils, ncurses, libX11 }: { stdenv, fetchgit, coreutils, cctools, ncurses, libiconv, libX11 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "chez-scheme-${version}"; name = "chez-scheme-${version}";
@ -12,8 +12,9 @@ stdenv.mkDerivation rec {
fetchSubmodules = true; fetchSubmodules = true;
}; };
enableParallelBuilding = true; nativeBuildInputs = [ coreutils ] ++ stdenv.lib.optional stdenv.isDarwin cctools;
buildInputs = [ ncurses libX11 ];
buildInputs = [ ncurses libiconv libX11 ];
/* We patch out a very annoying 'feature' in ./configure, which /* We patch out a very annoying 'feature' in ./configure, which
** tries to use 'git' to update submodules. ** tries to use 'git' to update submodules.
@ -27,11 +28,14 @@ stdenv.mkDerivation rec {
--replace "git submodule init && git submodule update || exit 1" "true" --replace "git submodule init && git submodule update || exit 1" "true"
substituteInPlace ./workarea \ substituteInPlace ./workarea \
--replace "/bin/ln" "${coreutils}/bin/ln" \ --replace "/bin/ln" ln \
--replace "/bin/cp" "${coreutils}/bin/cp" --replace "/bin/cp" cp
substituteInPlace ./makefiles/installsh \ substituteInPlace ./makefiles/installsh \
--replace "/usr/bin/true" "${coreutils}/bin/true" --replace "/usr/bin/true" "${coreutils}/bin/true"
substituteInPlace zlib/configure \
--replace "/usr/bin/libtool" libtool
''; '';
/* Don't use configureFlags, since that just implicitly appends /* Don't use configureFlags, since that just implicitly appends
@ -42,11 +46,13 @@ stdenv.mkDerivation rec {
./configure --threads --installprefix=$out --installman=$out/share/man ./configure --threads --installprefix=$out --installman=$out/share/man
''; '';
enableParallelBuilding = true;
meta = { meta = {
description = "A powerful and incredibly fast R6RS Scheme compiler"; description = "A powerful and incredibly fast R6RS Scheme compiler";
homepage = "http://www.scheme.com"; homepage = "http://www.scheme.com";
license = stdenv.lib.licenses.asl20; license = stdenv.lib.licenses.asl20;
platforms = stdenv.lib.platforms.linux; platforms = stdenv.lib.platforms.unix;
maintainers = with stdenv.lib.maintainers; [ thoughtpolice ]; maintainers = with stdenv.lib.maintainers; [ thoughtpolice ];
}; };
} }

4
pkgs/top-level/all-packages.nix
View File

@ -5456,7 +5456,9 @@ with pkgs;
ccl = callPackage ../development/compilers/ccl { }; ccl = callPackage ../development/compilers/ccl { };
chez = callPackage ../development/compilers/chez { }; chez = callPackage ../development/compilers/chez {
inherit (darwin) cctools;
};
clang = llvmPackages.clang; clang = llvmPackages.clang;