diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-05-22 15:57:36 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-05-22 15:57:36 +0200 |
| commit | 09d06f5ffd867afc72d5ca6786f73aed2b80e207 (patch) | |
| tree | 0b39699b6fae1ea7f5e6b40b2214c901eb9a578b /pkgs/development/interpreters/ruby | |
| parent | f106125f77ba2b3588f95ef58667763042f808c9 (diff) | |
| parent | a49afdf1743436ac07c9be9da1d27ea5461af571 (diff) | |
| download | nixlib-09d06f5ffd867afc72d5ca6786f73aed2b80e207.tar nixlib-09d06f5ffd867afc72d5ca6786f73aed2b80e207.tar.gz nixlib-09d06f5ffd867afc72d5ca6786f73aed2b80e207.tar.bz2 nixlib-09d06f5ffd867afc72d5ca6786f73aed2b80e207.tar.lz nixlib-09d06f5ffd867afc72d5ca6786f73aed2b80e207.tar.xz nixlib-09d06f5ffd867afc72d5ca6786f73aed2b80e207.tar.zst nixlib-09d06f5ffd867afc72d5ca6786f73aed2b80e207.zip | |
Merge remote-tracking branch 'origin/master' into systemd-219
Conflicts: pkgs/development/libraries/libseccomp/default.nix
Diffstat (limited to 'pkgs/development/interpreters/ruby')
| -rw-r--r-- | pkgs/development/interpreters/ruby/ruby-1.8.7.nix | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/development/interpreters/ruby/ruby-1.8.7.nix b/pkgs/development/interpreters/ruby/ruby-1.8.7.nix index 3c2ea71ecf26..0ae1d1261eed 100644 --- a/pkgs/development/interpreters/ruby/ruby-1.8.7.nix +++ b/pkgs/development/interpreters/ruby/ruby-1.8.7.nix @@ -60,6 +60,9 @@ stdenv.mkDerivation rec { ]; configureFlags = [ "--enable-shared" "--enable-pthread" ] + # Without this fails due to not finding X11/Xlib.h + # Not sure why this isn't required on Linux + ++ ops stdenv.isDarwin [ "--without-tcl" "--without-tk" ] ++ op useRailsExpress "--with-baseruby=${baseruby}/bin/ruby"; installFlags = stdenv.lib.optionalString docSupport "install-doc"; |