diff options
| author | Michael Fellinger <michael.fellinger@xing.com> | 2019-05-03 12:48:14 +0200 |
|---|---|---|
| committer | zimbatm <zimbatm@zimbatm.com> | 2019-05-03 12:48:13 +0200 |
| commit | 9a0596ee9738d8e23f9b8d628604c3a6c2517613 (patch) | |
| tree | 79e2eba3f7963cab2ab05db6587d3d19d1671cf8 /pkgs/development/ruby-modules/gem-config | |
| parent | 7da6230cdd9c46b1d078e38ff746db4114175fcb (diff) | |
| download | nixpkgs-9a0596ee9738d8e23f9b8d628604c3a6c2517613.tar nixpkgs-9a0596ee9738d8e23f9b8d628604c3a6c2517613.tar.gz nixpkgs-9a0596ee9738d8e23f9b8d628604c3a6c2517613.tar.bz2 nixpkgs-9a0596ee9738d8e23f9b8d628604c3a6c2517613.tar.lz nixpkgs-9a0596ee9738d8e23f9b8d628604c3a6c2517613.tar.xz nixpkgs-9a0596ee9738d8e23f9b8d628604c3a6c2517613.tar.zst nixpkgs-9a0596ee9738d8e23f9b8d628604c3a6c2517613.zip | |
mikutter: 3.5.13 -> 3.8.7 (#60808)
Diffstat (limited to 'pkgs/development/ruby-modules/gem-config')
| -rw-r--r-- | pkgs/development/ruby-modules/gem-config/default.nix | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 4e2de5c9caf..f9f1addd4c3 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -23,7 +23,7 @@ , cmake, libssh2, openssl, mysql, darwin, git, perl, pcre, gecode_3, curl , msgpack, qt59, 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 +, file, libvirt, glib, vips, taglib, libopus, linux-pam, libidn, protobuf, fribidi, harfbuzz , libselinux ? null, libsepol ? null }@args: @@ -179,9 +179,17 @@ in gtk2 = attrs: { nativeBuildInputs = [ pkgconfig ] ++ lib.optionals stdenv.isLinux [ utillinux libselinux libsepol ]; - buildInputs = [ gtk2 pcre xorg.libpthreadstubs xorg.libXdmcp]; + buildInputs = [ + fribidi + gobject-introspection + gtk2 + harfbuzz + pcre + xorg.libpthreadstubs + xorg.libXdmcp + ]; # CFLAGS must be set for this gem to detect gdkkeysyms.h correctly - CFLAGS = "-I${gtk2.dev}/include/gtk-2.0 -I/non-existent-path"; + # CFLAGS = "-I${gtk2.dev}/include/gtk-2.0 -I/non-existent-path"; }; gobject-introspection = attrs: { @@ -299,7 +307,15 @@ in pango = attrs: { nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk2 xorg.libXdmcp pcre xorg.libpthreadstubs ]; + buildInputs = [ + fribidi + gobject-introspection + gtk2 + harfbuzz + pcre + xorg.libpthreadstubs + xorg.libXdmcp + ]; }; patron = attrs: { |