diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index a380f9734bfd..5a3ec1f68469 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -21,12 +21,12 @@ , libiconv, postgresql, v8, clang, sqlite, zlib, imagemagick, lasem , pkg-config , ncurses, xapian, gpgme, util-linux, tzdata, icu, libffi , cmake, libssh2, openssl, openssl_1_1, libmysqlclient, git, perl, pcre, pcre2, gecode_3, curl -, msgpack, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, buildRubyGem +, msgpack, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, gtk3, buildRubyGem , cairo, expat, 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 , bundler, libsass, dart-sass, libexif, libselinux, libsepol, shared-mime-info, libthai, libdatrie -, CoreServices, DarwinTools, cctools, libtool, discount, exiv2, libmaxminddb, libyaml +, CoreServices, DarwinTools, cctools, libtool, discount, exiv2, libepoxy, libxkbcommon, libmaxminddb, libyaml , autoSignDarwinBinariesHook, fetchpatch }@args: @@ -232,6 +232,12 @@ in propagatedBuildInputs = [ gobject-introspection wrapGAppsHook gdk-pixbuf ]; }; + gdk3 = attrs: { + nativeBuildInputs = [ pkg-config bundler rake ] + ++ lib.optionals stdenv.isDarwin [ DarwinTools ]; + propagatedBuildInputs = [ gobject-introspection wrapGAppsHook gdk-pixbuf cairo ]; + }; + gpgme = attrs: { buildInputs = [ gpgme ]; nativeBuildInputs = [ pkg-config ]; @@ -320,6 +326,36 @@ in dontStrip = stdenv.isDarwin; }; + gtk3 = attrs: { + nativeBuildInputs = [ + binutils + pkg-config + ] ++ lib.optionals stdenv.isLinux [ + util-linux + libselinux + libsepol + ] ++ lib.optionals stdenv.isDarwin [ DarwinTools ]; + propagatedBuildInputs = [ + atk + gdk-pixbuf + fribidi + gobject-introspection + gtk3 + cairo + harfbuzz + libdatrie + libthai + pcre + pcre2 + xorg.libpthreadstubs + xorg.libXdmcp + xorg.libXtst + libxkbcommon + libepoxy + ]; + dontStrip = stdenv.isDarwin; + }; + gobject-introspection = attrs: { nativeBuildInputs = [ pkg-config pcre2 ] ++ lib.optionals stdenv.isDarwin [ DarwinTools ]; diff --git a/pkgs/development/ruby-modules/with-packages/Gemfile b/pkgs/development/ruby-modules/with-packages/Gemfile index ebc5d4c0b8e7..86b8618c92d3 100644 --- a/pkgs/development/ruby-modules/with-packages/Gemfile +++ b/pkgs/development/ruby-modules/with-packages/Gemfile @@ -66,7 +66,7 @@ gem 'glib2' # gem 'gobject-introspection' fails on require gem 'gpgme' # gem 'grpc' fails to build -gem 'gtk2' +gem 'gtk3' gem 'hashie' gem 'highline' gem 'hike' diff --git a/pkgs/top-level/ruby-packages.nix b/pkgs/top-level/ruby-packages.nix index 247cbfc21e6c..58b673e50dbc 100644 --- a/pkgs/top-level/ruby-packages.nix +++ b/pkgs/top-level/ruby-packages.nix @@ -1168,6 +1168,17 @@ }; version = "2.0.4"; }; + gdk3 = { + dependencies = ["cairo-gobject" "gdk_pixbuf2" "pango"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0dpqlsfv44bxzixh386qwz28wfynhwkp9qz97b6zjx4wjh4fg4gj"; + type = "gem"; + }; + version = "4.2.0"; + }; gdk_pixbuf2 = { dependencies = ["gio2"]; groups = ["default"]; @@ -1297,15 +1308,16 @@ }; version = "2.0.23"; }; - gtk2 = { + gtk3 = { + dependencies = ["atk" "gdk3"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09n8gz5h0d0wwrifr8c8z0b4vrd64xdi4lws8p6gpz0j0pxm5fzh"; + sha256 = "15jk1q82g6jfswmz4b20kg2nxq4yc8wpidn9si9j7n0haxph3vxy"; type = "gem"; }; - version = "3.2.6"; + version = "4.2.0"; }; haml = { dependencies = ["temple" "thor" "tilt"];