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>

1 files changed, 10 insertions, 17 deletions

diff --git a/pkgs/development/compilers/chez/default.nix b/pkgs/development/compilers/chez/default.nix
index d9e7cc507305..65200dce71ef 100644
--- a/pkgs/development/compilers/chez/default.nix
+++ b/pkgs/development/compilers/chez/default.nix
@@ -3,39 +3,32 @@
 stdenv.mkDerivation rec {
   name    = "chez-scheme-${version}";
   version = "9.4-${dver}";
-  dver    = "20160501";
+  dver    = "20160507";
 
   src = fetchgit {
     url    = "https://github.com/cisco/chezscheme.git";
-    rev    = "8343b7172532a00d2d19914206fcf83c93798c80";
-    sha256 = "1jq55sdk468lckccfnqh0iv868bhw6yb9ba9bakqg2pfydb8r4qf";
+    rev    = "65df1d1f7c37f5b5a93cd7e5b475dda9dbafe03c";
+    sha256 = "024x79xcdqp665xjyccpn02w6dmdvnhw0h0vdc42g9s5wv5ry92m";
     fetchSubmodules = true;
   };
 
   enableParallelBuilding = true;
   buildInputs = [ ncurses libX11 ];
 
-  /* Chez uses a strange default search path, which completely
-  ** ignores the installation prefix for some reason, and instead
-  ** defaults to {/usr,/usr/local,$HOME}/lib for finding the .boot
-  ** file.
+  /* We patch out a very annoying 'feature' in ./configure, which
+  ** tries to use 'git' to update submodules.
   **
-  ** Also, we patch out a very annoying 'feature' in ./configure, too,
-  ** which tries to use 'git' to update submodules.
-  **
-  ** 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.
+  ** 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 = ''
-    substituteInPlace ./c/scheme.c \
-      --replace "/usr/lib/csv" "$out/lib/csv"
-
     substituteInPlace ./configure \
       --replace "git submodule init && git submodule update || exit 1" ""
 
     substituteInPlace ./workarea \
-      --replace "/bin/ln" "${coreutils}/bin/ln"
+      --replace "/bin/ln" "${coreutils}/bin/ln" \
+      --replace "/bin/cp" "${coreutils}/bin/cp"
 
     substituteInPlace ./makefiles/installsh \
       --replace "/usr/bin/true" "${coreutils}/bin/true"