colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rubyPackages.*: satisfy pcre* requirements in GTK stack

Browse Source 
Some of them want both versions.  Suspicious but OK I guess.
This commit is contained in:
Vladimír Čunát 2022-10-12 18:32:28 +02:00
parent af4a69ffff
commit 81e445e508
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/development/ruby-modules/gem-config/default.nix
View File

@ -20,7 +20,7 @@
{ lib, fetchurl, writeScript, ruby, libkrb5, libxml2, libxslt, python2, stdenv, which
, 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, gecode_3, curl
, cmake, libssh2, openssl, openssl_1_1, libmysqlclient, git, perl, pcre, pcre2, gecode_3, curl
, 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
@ -69,13 +69,13 @@ in
cairo = attrs: {
nativeBuildInputs = [ pkg-config ]
++ lib.optionals stdenv.isDarwin [ DarwinTools ];
buildInputs = [ gtk2 pcre xorg.libpthreadstubs xorg.libXdmcp];
buildInputs = [ gtk2 pcre2 xorg.libpthreadstubs xorg.libXdmcp];
};
cairo-gobject = attrs: {
nativeBuildInputs = [ pkg-config ]
++ lib.optionals stdenv.isDarwin [ DarwinTools ];
buildInputs = [ cairo pcre xorg.libpthreadstubs xorg.libXdmcp ];
buildInputs = [ cairo pcre2 xorg.libpthreadstubs xorg.libXdmcp ];
};
charlock_holmes = attrs: {
@ -230,7 +230,7 @@ in
gio2 = attrs: {
nativeBuildInputs = [ pkg-config ]
++ lib.optionals stdenv.isDarwin [ DarwinTools ];
buildInputs = [ gtk2 pcre gobject-introspection ] ++ lib.optionals stdenv.isLinux [ util-linux libselinux libsepol ];
buildInputs = [ gtk2 pcre pcre2 gobject-introspection ] ++ lib.optionals stdenv.isLinux [ util-linux libselinux libsepol ];
};
gitlab-markup = attrs: { meta.priority = 1; };
@ -275,7 +275,7 @@ in
glib2 = attrs: {
nativeBuildInputs = [ pkg-config ]
++ lib.optionals stdenv.isDarwin [ DarwinTools ];
buildInputs = [ gtk2 pcre ];
buildInputs = [ gtk2 pcre2 ];
};
gtk2 = attrs: {
@ -293,7 +293,7 @@ in
harfbuzz
libdatrie
libthai
pcre
pcre pcre2
xorg.libpthreadstubs
xorg.libXdmcp
];
@ -301,7 +301,7 @@ in
};
gobject-introspection = attrs: {
nativeBuildInputs = [ pkg-config pcre ]
nativeBuildInputs = [ pkg-config pcre2 ]
++ lib.optionals stdenv.isDarwin [ DarwinTools ];
propagatedBuildInputs = [ gobject-introspection wrapGAppsHook glib ];
};
@ -518,7 +518,7 @@ in
pkg-config
fribidi
harfbuzz
pcre
pcre pcre2
xorg.libpthreadstubs
xorg.libXdmcp
] ++ lib.optionals stdenv.isDarwin [ DarwinTools ];