dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #4147 from cstrahan/ruby-interp-fixes

Browse Source 
Fix the new Ruby interpreters (fixes #3509).
This commit is contained in:
lethalman 2014-09-18 18:21:27 +02:00
commit ef8ac7fec4
4 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/interpreters/ruby/config.nix Normal file
View File

@ -0,0 +1,6 @@
# Ruby >= 2.1.0 tries to download config.{guess,sub}
fetchgit: fetchgit {
url = "git://git.sv.gnu.org/config.git";
rev = "576c839acca0e082e536fd27568b90a446ce5b96";
sha256 = "11bjngchjhj0qq0ppp8c37rfw0yhp230nvhs2jvlx15i9qbf56a0";
}

10
pkgs/development/interpreters/ruby/ruby-2.1.0.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchFromGitHub
{ stdenv, fetchurl, fetchgit, fetchFromGitHub
, zlib, zlibSupport ? true
, openssl, opensslSupport ? true
, gdbm, gdbmSupport ? true
@ -12,6 +12,7 @@ let
op = stdenv.lib.optional;
ops = stdenv.lib.optionals;
patchSet = import ./rvm-patchsets.nix { inherit fetchFromGitHub; };
config = import ./config.nix fetchgit;
baseruby = ruby_2_1_0.override { useRailsExpress = false; };
in
@ -63,6 +64,13 @@ stdenv.mkDerivation rec {
"${patchSet}/patches/ruby/2.1.0/railsexpress/12-backport-r44370.patch"
];
# Ruby >= 2.1.0 tries to download config.{guess,sub}
postPatch = ''
rm tool/config_files.rb
cp ${config}/config.guess tool/
cp ${config}/config.sub tool/
'';
configureFlags = ["--enable-shared" ]
++ op useRailsExpress "--with-baseruby=${baseruby}/bin/ruby"
# on darwin, we have /usr/include/tk.h -- so the configure script detects

10
pkgs/development/interpreters/ruby/ruby-2.1.1.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchFromGitHub
{ stdenv, fetchurl, fetchgit, fetchFromGitHub
, zlib, zlibSupport ? true
, openssl, opensslSupport ? true
, gdbm, gdbmSupport ? true
@ -12,6 +12,7 @@ let
op = stdenv.lib.optional;
ops = stdenv.lib.optionals;
patchSet = import ./rvm-patchsets.nix { inherit fetchFromGitHub; };
config = import ./config.nix fetchgit;
baseruby = ruby_2_1_1.override { useRailsExpress = false; };
in
@ -62,6 +63,13 @@ stdenv.mkDerivation rec {
"${patchSet}/patches/ruby/2.1.0/railsexpress/11-backport-r44370.patch"
];
# Ruby >= 2.1.0 tries to download config.{guess,sub}
postPatch = ''
rm tool/config_files.rb
cp ${config}/config.guess tool/
cp ${config}/config.sub tool/
'';
configureFlags = ["--enable-shared" ]
++ op useRailsExpress "--with-baseruby=${baseruby}/bin/ruby"
# on darwin, we have /usr/include/tk.h -- so the configure script detects

10
pkgs/development/interpreters/ruby/ruby-2.1.2.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchFromGitHub
{ stdenv, fetchurl, fetchgit, fetchFromGitHub
, zlib, zlibSupport ? true
, openssl, opensslSupport ? true
, gdbm, gdbmSupport ? true
@ -12,6 +12,7 @@ let
op = stdenv.lib.optional;
ops = stdenv.lib.optionals;
patchSet = import ./rvm-patchsets.nix { inherit fetchFromGitHub; };
config = import ./config.nix fetchgit;
baseruby = ruby_2_1_2.override { useRailsExpress = false; };
in
@ -61,6 +62,13 @@ stdenv.mkDerivation rec {
"${patchSet}/patches/ruby/2.1.2/railsexpress/10-funny-falcon-method-cache.patch"
];
# Ruby >= 2.1.0 tries to download config.{guess,sub}
postPatch = ''
rm tool/config_files.rb
cp ${config}/config.guess tool/
cp ${config}/config.sub tool/
'';
configureFlags = ["--enable-shared" ]
++ op useRailsExpress "--with-baseruby=${baseruby}/bin/ruby"
# on darwin, we have /usr/include/tk.h -- so the configure script detects