summary refs log tree commit diff
path: root/pkgs/development/ruby-modules/gem-config
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2018-10-19 11:31:35 +0100
committerAlyssa Ross <hi@alyssa.is>2018-10-23 16:14:21 +0100
commitc0ad5bc83920e987a5f1c8d8708cfd876702799f (patch)
tree513e30372493bf8529df2779c1fd9fde243603e5 /pkgs/development/ruby-modules/gem-config
parent5b1e005bb67921c1bb37068d8ea99e8c8ec05df9 (diff)
downloadnixlib-c0ad5bc83920e987a5f1c8d8708cfd876702799f.tar
nixlib-c0ad5bc83920e987a5f1c8d8708cfd876702799f.tar.gz
nixlib-c0ad5bc83920e987a5f1c8d8708cfd876702799f.tar.bz2
nixlib-c0ad5bc83920e987a5f1c8d8708cfd876702799f.tar.lz
nixlib-c0ad5bc83920e987a5f1c8d8708cfd876702799f.tar.xz
nixlib-c0ad5bc83920e987a5f1c8d8708cfd876702799f.tar.zst
nixlib-c0ad5bc83920e987a5f1c8d8708cfd876702799f.zip
gem-config: capybara-webkit: qt48 -> qt59
> WARNING: The next major version of capybara-webkit will require at
> least version 5.0 of Qt. You're using version 4.8.7.

I went to 5.9 instead of 5.11 because 5.11 doesn't currently build on
Darwin, whereas 5.9 can build on both Darwin and Linux, and is still
well within the >=5.0 requirement.
Diffstat (limited to 'pkgs/development/ruby-modules/gem-config')
-rw-r--r--pkgs/development/ruby-modules/gem-config/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix
index 01644080b40c..b5aa0933c2e8 100644
--- a/pkgs/development/ruby-modules/gem-config/default.nix
+++ b/pkgs/development/ruby-modules/gem-config/default.nix
@@ -21,7 +21,7 @@
 , libiconv, postgresql, v8_3_16_14, clang, sqlite, zlib, imagemagick
 , pkgconfig , ncurses, xapian_1_2_22, gpgme, utillinux, fetchpatch, tzdata, icu, libffi
 , cmake, libssh2, openssl, mysql, darwin, git, perl, pcre, gecode_3, curl
-, msgpack, qt48, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, buildRubyGem
+, msgpack, qt59, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, buildRubyGem
 , cairo, re2, rake, gobjectIntrospection, gdk_pixbuf, zeromq, graphicsmagick, libcxx, file
 }@args:
 
@@ -69,7 +69,7 @@ in
   };
 
   capybara-webkit = attrs: {
-    buildInputs = [ qt48 ] ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ];
+    buildInputs = [ qt59.qtbase qt59.qtwebkit ] ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ];
     NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";
   };