about summary refs log tree commit diff
path: root/pkgs/development/interpreters/ruby
diff options
context:
space:
mode:
authorzimbatm <zimbatm@zimbatm.com>2013-11-24 16:42:18 +0000
committerVladimír Čunát <vcunat@gmail.com>2013-12-02 20:11:58 +0100
commit7a01483d51dd84ee093926a56517f0e13b6d531e (patch)
treed150a60f95b489ff7d231a86a037dfc937c71741 /pkgs/development/interpreters/ruby
parent8da629a3b98cee4f5e9ca314170135f42240fb81 (diff)
downloadnixlib-7a01483d51dd84ee093926a56517f0e13b6d531e.tar
nixlib-7a01483d51dd84ee093926a56517f0e13b6d531e.tar.gz
nixlib-7a01483d51dd84ee093926a56517f0e13b6d531e.tar.bz2
nixlib-7a01483d51dd84ee093926a56517f0e13b6d531e.tar.lz
nixlib-7a01483d51dd84ee093926a56517f0e13b6d531e.tar.xz
nixlib-7a01483d51dd84ee093926a56517f0e13b6d531e.tar.zst
nixlib-7a01483d51dd84ee093926a56517f0e13b6d531e.zip
Fixes ruby 2.0.0 compilation on Darwin.
Diffstat (limited to 'pkgs/development/interpreters/ruby')
-rw-r--r--pkgs/development/interpreters/ruby/ruby-2.0.nix12
1 files changed, 10 insertions, 2 deletions
diff --git a/pkgs/development/interpreters/ruby/ruby-2.0.nix b/pkgs/development/interpreters/ruby/ruby-2.0.nix
index 7c47bac0bbbc..975fecd1a3f8 100644
--- a/pkgs/development/interpreters/ruby/ruby-2.0.nix
+++ b/pkgs/development/interpreters/ruby/ruby-2.0.nix
@@ -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" ]
+    # 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