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

nixpkgs: fix chez build failures

Browse Source 
The Chez build was failing, as usual, due to impurities. The build
system refers to absolute paths for tools like `ln` or `true`, which
was the real culprit here. Furthermore the build also 'helpfully'
suppresses errors in these cases by piping to /dev/null, so you never
see any errors at build time until it's too late (otherwise, you'd
see failures to call /bin/ln or at ./configure time).

This also re-enables parallel builds, as they should be safe from
all my testing, I believe.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
This commit is contained in:
Austin Seipp 2016-05-01 22:10:18 +00:00
parent 30240ccb9d
commit a1d61e7367
1 changed files with 15 additions and 3 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, ncurses, libX11 }: { stdenv, fetchgit, coreutils, ncurses, libX11 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "chez-scheme-${version}"; name = "chez-scheme-${version}";
@ -12,6 +12,7 @@ stdenv.mkDerivation rec {
fetchSubmodules = true; fetchSubmodules = true;
}; };
enableParallelBuilding = true;
buildInputs = [ ncurses libX11 ]; buildInputs = [ ncurses libX11 ];
/* Chez uses a strange default search path, which completely /* Chez uses a strange default search path, which completely
@ -19,14 +20,25 @@ stdenv.mkDerivation rec {
** defaults to {/usr,/usr/local,$HOME}/lib for finding the .boot ** defaults to {/usr,/usr/local,$HOME}/lib for finding the .boot
** file. ** file.
** **
** Also, we patch out a very annoying 'feature' in ./configure, too. ** 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.
*/ */
patchPhase = '' patchPhase = ''
substituteInPlace c/scheme.c \ substituteInPlace ./c/scheme.c \
--replace "/usr/lib/csv" "$out/lib/csv" --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 \
--replace "/bin/ln" "${coreutils}/bin/ln"
substituteInPlace ./makefiles/installsh \
--replace "/usr/bin/true" "${coreutils}/bin/true"
''; '';
/* Don't use configureFlags, since that just implicitly appends /* Don't use configureFlags, since that just implicitly appends