From a45998f10df3dc90b3685805c32ceb034b6846b0 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Sat, 16 Nov 2013 23:26:03 +0000 Subject: [PATCH] ruby-2.0.0p247 Bumps the ruby 2.0.0 version and fixes build on OSX --- .../development/interpreters/ruby/ruby-2.0.nix | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/pkgs/development/interpreters/ruby/ruby-2.0.nix b/pkgs/development/interpreters/ruby/ruby-2.0.nix index 7c47bac0bbbc1..706256386d350 100644 --- a/pkgs/development/interpreters/ruby/ruby-2.0.nix +++ b/pkgs/development/interpreters/ruby/ruby-2.0.nix @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { name = "ruby-${version}"; src = fetchurl { - url = "ftp://ftp.ruby-lang.org/pub/ruby/2.0/${name}.tar.bz2"; - sha256 = "0pr9jf01cfap93xcngyd5zpns67ffjsgaxkm0qr1r464rj9d7066"; + url = "http://cache.ruby-lang.org/pub/ruby/2.0/${name}.tar.bz2"; + sha256 = "08e3d4b85b8a1118a8e81261f59dd8b4ddcfd70b6ae554e0ec5ceb99c3185e8a"; }; # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds. @@ -30,11 +30,19 @@ stdenv.mkDerivation rec { ++ (op zlibSupport zlib) ++ (op opensslSupport openssl) ++ (op gdbmSupport gdbm) - ++ (op yamlSupport libyaml); + ++ (op yamlSupport libyaml) + # 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 + # running on darwin + ++ (op (!cursesSupport && stdenv.isDarwin) readline); enableParallelBuilding = true; - configureFlags = ["--enable-shared" ]; + configureFlags = ["--enable-shared" "--enable-pthread" ] + # on darwin, we have /usr/include/tk.h -- so the configure script detects + # that tk is installed + ++ ( if stdenv.isDarwin then [ "--with-out-ext=tk " ] else [ ]); installFlags = stdenv.lib.optionalString docSupport "install-doc"; # Bundler tries to create this directory @@ -50,7 +58,7 @@ stdenv.mkDerivation rec { passthru = rec { majorVersion = "2.0"; minorVersion = "0"; - patchLevel = "0"; + patchLevel = "247"; libPath = "lib/ruby/${majorVersion}"; gemPath = "lib/ruby/gems/${majorVersion}"; };