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

nixpkgs: chez-scheme 9.4-20160501 -> 9.4-20160507 

This allows us to remove a hack in the makefile, fixes a few bugs, and
also catches another edge case in the configure scripts.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
This commit is contained in:
Austin Seipp 2016-05-08 03:40:43 +00:00
parent ea9f28a46e
commit e3e27ecf4e
1 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,39 +3,32 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "chez-scheme-${version}"; name = "chez-scheme-${version}";
version = "9.4-${dver}"; version = "9.4-${dver}";
dver = "20160501"; dver = "20160507";
src = fetchgit { src = fetchgit {
url = "https://github.com/cisco/chezscheme.git"; url = "https://github.com/cisco/chezscheme.git";
rev = "8343b7172532a00d2d19914206fcf83c93798c80"; rev = "65df1d1f7c37f5b5a93cd7e5b475dda9dbafe03c";
sha256 = "1jq55sdk468lckccfnqh0iv868bhw6yb9ba9bakqg2pfydb8r4qf"; sha256 = "024x79xcdqp665xjyccpn02w6dmdvnhw0h0vdc42g9s5wv5ry92m";
fetchSubmodules = true; fetchSubmodules = true;
}; };
enableParallelBuilding = true; enableParallelBuilding = true;
buildInputs = [ ncurses libX11 ]; buildInputs = [ ncurses libX11 ];
/* Chez uses a strange default search path, which completely /* We patch out a very annoying 'feature' in ./configure, which
** ignores the installation prefix for some reason, and instead ** tries to use 'git' to update submodules.
** defaults to {/usr,/usr/local,$HOME}/lib for finding the .boot
** file.
** **
** Also, we patch out a very annoying 'feature' in ./configure, too, ** We have to also fix a few occurrences to tools with absolute
** which tries to use 'git' to update submodules. ** paths in some helper scripts, otherwise the build will fail on
** ** NixOS or in any chroot build.
** Finally, we have to also fix a few occurrences to tools with
** absolute paths in some helper scripts, otherwise the build will
** fail on NixOS or in any chroot build.
*/ */
patchPhase = '' patchPhase = ''
substituteInPlace ./c/scheme.c \
--replace "/usr/lib/csv" "$out/lib/csv"
substituteInPlace ./configure \ substituteInPlace ./configure \
--replace "git submodule init && git submodule update || exit 1" "" --replace "git submodule init && git submodule update || exit 1" ""
substituteInPlace ./workarea \ substituteInPlace ./workarea \
--replace "/bin/ln" "${coreutils}/bin/ln" --replace "/bin/ln" "${coreutils}/bin/ln" \
--replace "/bin/cp" "${coreutils}/bin/cp"
substituteInPlace ./makefiles/installsh \ substituteInPlace ./makefiles/installsh \
--replace "/usr/bin/true" "${coreutils}/bin/true" --replace "/usr/bin/true" "${coreutils}/bin/true"