From dcfc821c6c4294db933dfee0b7de25d856ff49c2 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Mon, 11 Nov 2019 23:30:24 +0000 Subject: treewide: Stop using Qt 5.9 --- pkgs/development/ruby-modules/gem-config/default.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'pkgs/development/ruby-modules/gem-config') diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index d8c3d484f43..18e24d5a31e 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, clang, sqlite, zlib, imagemagick , pkgconfig , ncurses, xapian, gpgme, utillinux, tzdata, icu, libffi , cmake, libssh2, openssl, libmysqlclient, darwin, git, perl, pcre, gecode_3, curl -, msgpack, qt59, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, buildRubyGem +, msgpack, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, buildRubyGem , cairo, re2, rake, gobject-introspection, gdk-pixbuf, zeromq, czmq, graphicsmagick, libcxx , file, libvirt, glib, vips, taglib, libopus, linux-pam, libidn, protobuf, fribidi, harfbuzz , bison, flex, pango, python3, patchelf, binutils, freetds, wrapGAppsHook, atk @@ -70,11 +70,6 @@ in buildInputs = [ cairo pcre xorg.libpthreadstubs xorg.libXdmcp ]; }; - capybara-webkit = attrs: { - 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"; - }; - charlock_holmes = attrs: { buildInputs = [ which icu zlib ]; }; -- cgit 1.4.1 From c4aaab4053ab092530fdeede394499f9e709b833 Mon Sep 17 00:00:00 2001 From: buckley310 Date: Mon, 9 Dec 2019 19:07:19 -0500 Subject: defaultGemConfig: change 'infocmp' reference from 'ncurses.dev' to 'ncurses' (#75309) --- pkgs/development/ruby-modules/gem-config/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/development/ruby-modules/gem-config') diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 18e24d5a31e..de9d06f7ce0 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -536,7 +536,7 @@ in dontBuild = false; postPatch = '' substituteInPlace lib/rbreadline.rb \ - --replace 'infocmp' '${ncurses.dev}/bin/infocmp' + --replace 'infocmp' '${ncurses}/bin/infocmp' ''; }; -- cgit 1.4.1