ruby: fix cross-build (#51842)

Enable autoreconfHook by default: The build tried to execute autoconf, which was
in the wrong build input. Regenerating autotools configure files is always a good
idea since it delivers fixes.
Also move groff to the native since it is only used at build-time
This commit is contained in:
Jörg Thalheim 2018-12-11 08:01:58 +00:00 committed by zimbatm
parent fee79f543e
commit 10ba78757f
1 changed files with 4 additions and 8 deletions

View File

@ -73,20 +73,16 @@ let
# Have `configure' avoid `/usr/bin/nroff' in non-chroot builds. # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds.
NROFF = if docSupport then "${groff}/bin/nroff" else null; NROFF = if docSupport then "${groff}/bin/nroff" else null;
nativeBuildInputs = nativeBuildInputs = [ autoreconfHook bison ]
ops useRailsExpress [ autoreconfHook bison ] ++ (op docSupport groff)
++ ops (stdenv.buildPlatform != stdenv.hostPlatform) [ ++ op (stdenv.buildPlatform != stdenv.hostPlatform) buildPackages.ruby;
buildPackages.ruby
];
buildInputs = buildInputs =
(op fiddleSupport libffi) (op fiddleSupport libffi)
++ (ops cursesSupport [ ncurses readline ]) ++ (ops cursesSupport [ ncurses readline ])
++ (op docSupport groff)
++ (op zlibSupport zlib) ++ (op zlibSupport zlib)
++ (op opensslSupport openssl) ++ (op opensslSupport openssl)
++ (op gdbmSupport gdbm) ++ (op gdbmSupport gdbm)
++ (op yamlSupport libyaml) ++ (op yamlSupport libyaml)
++ (op isRuby25 autoconf)
# Looks like ruby fails to build on darwin without readline even if curses # Looks like ruby fails to build on darwin without readline even if curses
# support is not enabled, so add readline to the build inputs if curses # support is not enabled, so add readline to the build inputs if curses
# support is disabled (if it's enabled, we already have it) and we're # support is disabled (if it's enabled, we already have it) and we're
@ -149,7 +145,7 @@ let
postInstall = '' postInstall = ''
# Update rubygems # Update rubygems
pushd rubygems pushd rubygems
${buildRuby} setup.rb ${buildRuby} setup.rb --destdir $GEM_HOME
popd popd
# Remove unnecessary groff reference from runtime closure, since it's big # Remove unnecessary groff reference from runtime closure, since it's big