diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-02-26 10:50:18 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-02-26 10:50:18 +0100 |
| commit | 4f08b0fbac17c201216abbd776ce3bb292ed4946 (patch) | |
| tree | 129bb0b85b424612237e81d2cf303f7d5c0200fe /pkgs/development/libraries/gtk+ | |
| parent | 6b381d4c9bed35caee62265a92986cec189243b2 (diff) | |
| parent | 1d6abdd1775d12f7a90414c6e6b4c45ffc612246 (diff) | |
| download | nixlib-4f08b0fbac17c201216abbd776ce3bb292ed4946.tar nixlib-4f08b0fbac17c201216abbd776ce3bb292ed4946.tar.gz nixlib-4f08b0fbac17c201216abbd776ce3bb292ed4946.tar.bz2 nixlib-4f08b0fbac17c201216abbd776ce3bb292ed4946.tar.lz nixlib-4f08b0fbac17c201216abbd776ce3bb292ed4946.tar.xz nixlib-4f08b0fbac17c201216abbd776ce3bb292ed4946.tar.zst nixlib-4f08b0fbac17c201216abbd776ce3bb292ed4946.zip | |
Merge remote-tracking branch 'upstream/master' into HEAD
Diffstat (limited to 'pkgs/development/libraries/gtk+')
| -rw-r--r-- | pkgs/development/libraries/gtk+/3.x.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index e9c93660bf79..0f95cf7f3c66 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, gettext, perl -, expat, glib, cairo, pango, gdk_pixbuf, atk, at_spi2_atk, gobjectIntrospection -, xorg, epoxy, json_glib, libxkbcommon, gmp +, expat, glib, cairo, pango, gdk_pixbuf, atk, at-spi2-atk, gobjectIntrospection +, xorg, epoxy, json-glib, libxkbcommon, gmp , waylandSupport ? stdenv.isLinux, wayland, wayland-protocols , xineramaSupport ? stdenv.isLinux , cupsSupport ? stdenv.isLinux, cups ? null @@ -38,9 +38,9 @@ stdenv.mkDerivation rec { }) ]; - buildInputs = [ libxkbcommon epoxy json_glib ]; + buildInputs = [ libxkbcommon epoxy json-glib ]; propagatedBuildInputs = with xorg; with stdenv.lib; - [ expat glib cairo pango gdk_pixbuf atk at_spi2_atk gnome3.gsettings_desktop_schemas + [ expat glib cairo pango gdk_pixbuf atk at-spi2-atk gnome3.gsettings-desktop-schemas libXrandr libXrender libXcomposite libXi libXcursor libSM libICE ] ++ optionals waylandSupport [ wayland wayland-protocols ] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ AppKit Cocoa ]) |