From 10ba78757f4f3630eb37ebae83d4b73353f2fbcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 11 Dec 2018 08:01:58 +0000 Subject: [PATCH] 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 --- pkgs/development/interpreters/ruby/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index f1d48578541..1ee5c0b57ac 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -73,20 +73,16 @@ let # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds. NROFF = if docSupport then "${groff}/bin/nroff" else null; - nativeBuildInputs = - ops useRailsExpress [ autoreconfHook bison ] - ++ ops (stdenv.buildPlatform != stdenv.hostPlatform) [ - buildPackages.ruby - ]; + nativeBuildInputs = [ autoreconfHook bison ] + ++ (op docSupport groff) + ++ op (stdenv.buildPlatform != stdenv.hostPlatform) buildPackages.ruby; buildInputs = (op fiddleSupport libffi) ++ (ops cursesSupport [ ncurses readline ]) - ++ (op docSupport groff) ++ (op zlibSupport zlib) ++ (op opensslSupport openssl) ++ (op gdbmSupport gdbm) ++ (op yamlSupport libyaml) - ++ (op isRuby25 autoconf) # 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 disabled (if it's enabled, we already have it) and we're @@ -149,7 +145,7 @@ let postInstall = '' # Update rubygems pushd rubygems - ${buildRuby} setup.rb + ${buildRuby} setup.rb --destdir $GEM_HOME popd # Remove unnecessary groff reference from runtime closure, since it's big