Merge pull request #641 from lovek323/ruby19

ruby-1.9: disable tk when compiling on darwin
This commit is contained in:
Evgeny Egorochkin 2013-06-17 22:36:44 -07:00
commit d8806940d6

View File

@ -40,7 +40,10 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
patches = [ ./ruby19-parallel-install.patch ]; patches = [ ./ruby19-parallel-install.patch ];
configureFlags = ["--enable-shared" "--enable-pthread"]; 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"; installFlags = stdenv.lib.optionalString docSupport "install-doc";
# Bundler tries to create this directory # Bundler tries to create this directory