diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 36e770b05d0b..f358d47e2193 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -20,14 +20,14 @@ { lib, fetchurl, fetchpatch2, writeScript, ruby, libkrb5, libxml2, libxslt, python2, stdenv, which , libiconv, postgresql, nodejs, 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 -, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, gtk3, lerc, buildRubyGem +, cmake, libssh2, openssl, openssl_1_1, libmysqlclient, git, perl, pcre2, gecode_3, curl +, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk3, lerc, 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, wrapGAppsHook3, atk , bundler, libsass, dart-sass, libexif, libselinux, libsepol, shared-mime-info, libthai, libdatrie , CoreServices, DarwinTools, cctools, libtool, discount, exiv2, libepoxy, libxkbcommon, libmaxminddb, libyaml -, cargo, rustc, rustPlatform +, cargo, rustc, rustPlatform, libsysprof-capture , autoSignDarwinBinariesHook }@args: @@ -71,13 +71,13 @@ in cairo = attrs: { nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ DarwinTools ]; - buildInputs = [ gtk2 pcre2 xorg.libpthreadstubs xorg.libXdmcp]; + buildInputs = [ cairo expat glib libsysprof-capture pcre2 xorg.libpthreadstubs xorg.libXdmcp ]; }; cairo-gobject = attrs: { nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ DarwinTools ]; - buildInputs = [ cairo expat pcre2 xorg.libpthreadstubs xorg.libXdmcp ]; + buildInputs = [ cairo expat libsysprof-capture pcre2 xorg.libpthreadstubs xorg.libXdmcp ]; }; charlock_holmes = attrs: { @@ -257,7 +257,7 @@ in gio2 = attrs: { nativeBuildInputs = [ pkg-config gobject-introspection ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ DarwinTools ]; - buildInputs = [ gtk2 pcre pcre2 ] ++ lib.optionals stdenv.hostPlatform.isLinux [ util-linux libselinux libsepol ]; + buildInputs = [ glib libsysprof-capture pcre2 ] ++ lib.optionals stdenv.hostPlatform.isLinux [ util-linux libselinux libsepol ]; }; gitlab-markup = attrs: { meta.priority = 1; }; @@ -346,29 +346,7 @@ in glib2 = attrs: { nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ DarwinTools ]; - buildInputs = [ gtk2 pcre2 ]; - }; - - gtk2 = attrs: { - nativeBuildInputs = [ - binutils pkg-config - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - util-linux libselinux libsepol - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ DarwinTools ]; - propagatedBuildInputs = [ - atk - gdk-pixbuf - fribidi - gobject-introspection - gtk2 - harfbuzz - libdatrie - libthai - pcre pcre2 - xorg.libpthreadstubs - xorg.libXdmcp - ]; - dontStrip = stdenv.hostPlatform.isDarwin; + buildInputs = [ glib libsysprof-capture pcre2 ]; }; gtk3 = attrs: { @@ -390,8 +368,8 @@ in harfbuzz lerc libdatrie + libsysprof-capture libthai - pcre pcre2 xorg.libpthreadstubs xorg.libXdmcp @@ -403,9 +381,9 @@ in }; gobject-introspection = attrs: { - nativeBuildInputs = [ pkg-config pcre2 ] + nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ DarwinTools ]; - propagatedBuildInputs = [ gobject-introspection wrapGAppsHook3 glib ]; + propagatedBuildInputs = [ gobject-introspection wrapGAppsHook3 glib pcre2 libsysprof-capture ]; }; gollum = attrs: { @@ -653,15 +631,10 @@ in pango = attrs: { nativeBuildInputs = [ pkg-config - fribidi - harfbuzz - pcre pcre2 - xorg.libpthreadstubs - xorg.libXdmcp ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ DarwinTools ]; - buildInputs = [ libdatrie libthai ] + buildInputs = [ libdatrie libthai fribidi harfbuzz libsysprof-capture pcre2 xorg.libpthreadstubs xorg.libXdmcp ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libselinux libsepol util-linux ]; - propagatedBuildInputs = [ gobject-introspection wrapGAppsHook3 gtk2 ]; + propagatedBuildInputs = [ gobject-introspection wrapGAppsHook3 ]; }; patron = attrs: {