ruby: remove fetchFromSavannah fetcher with files from autoconf
Co-developed-by: Philip Taron <philip.taron@gmail.com>
This commit is contained in:
@@ -1,8 +0,0 @@
|
||||
# Ruby >= 2.1.0 tries to download config.{guess,sub}
|
||||
{ fetchFromSavannah }:
|
||||
|
||||
fetchFromSavannah {
|
||||
repo = "config";
|
||||
rev = "576c839acca0e082e536fd27568b90a446ce5b96";
|
||||
sha256 = "11bjngchjhj0qq0ppp8c37rfw0yhp230nvhs2jvlx15i9qbf56a0";
|
||||
}
|
||||
@@ -4,7 +4,6 @@
|
||||
lib,
|
||||
fetchurl,
|
||||
fetchpatch,
|
||||
fetchFromSavannah,
|
||||
zlib,
|
||||
gdbm,
|
||||
ncurses,
|
||||
@@ -38,7 +37,6 @@ let
|
||||
op = lib.optional;
|
||||
ops = lib.optionals;
|
||||
opString = lib.optionalString;
|
||||
config = import ./config.nix { inherit fetchFromSavannah; };
|
||||
rubygems = import ./rubygems {
|
||||
inherit
|
||||
stdenv
|
||||
@@ -74,7 +72,6 @@ let
|
||||
lib,
|
||||
fetchurl,
|
||||
fetchpatch,
|
||||
fetchFromSavannah,
|
||||
rubygemsSupport ? true,
|
||||
zlib,
|
||||
zlibSupport ? true,
|
||||
@@ -229,10 +226,10 @@ let
|
||||
cp -r ${rubygems}/lib/rubygems* $sourceRoot/lib
|
||||
'';
|
||||
|
||||
# Ruby >= 2.1.0 tries to download config.{guess,sub}; copy it from autoconf instead.
|
||||
postPatch = ''
|
||||
sed -i configure.ac -e '/config.guess/d'
|
||||
cp --remove-destination ${config}/config.guess tool/
|
||||
cp --remove-destination ${config}/config.sub tool/
|
||||
cp --remove-destination ${autoconf}/share/autoconf/build-aux/config.{guess,sub} tool/
|
||||
'';
|
||||
|
||||
configureFlags = [
|
||||
|
||||
Reference in New Issue
Block a user