Merge #32626: atk: clean up

2024-09-21 20:49:52 +03:00 · 2017-12-29 10:01:00 +01:00 · 2017-12-29 10:01:00 +01:00 · 6bbec17d44
commit 6bbec17d44
parent 1963be9945 21b09d7961
19 changed files with 75 additions and 42 deletions
--- a/pkgs/applications/misc/deepin-terminal/default.nix
+++ b/pkgs/applications/misc/deepin-terminal/default.nix
@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, gtk3, vala, cmake, vte, libgee, wnck, zssh, gettext, librsvg, libsecret, json_glib }:
+{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, gtk3, vala, cmake, vte, libgee, wnck, zssh, gettext, librsvg, libsecret, json_glib, gobjectIntrospection }:

 stdenv.mkDerivation rec {
  name = "deepin-terminal-${version}";
@ -25,7 +25,11 @@ stdenv.mkDerivation rec {
    substituteInPlace ssh_login.sh --replace /usr/lib/deepin-terminal/zssh "${zssh}/bin/zssh"
  '';

-  nativeBuildInputs = [ pkgconfig vala cmake gettext ];
+  nativeBuildInputs = [
+    pkgconfig vala cmake gettext
+    # For setup hook
+    gobjectIntrospection
+  ];
  buildInputs = [ gtk3 vte libgee wnck librsvg libsecret json_glib ];

  meta = with stdenv.lib; {
--- a/pkgs/applications/misc/font-manager/default.nix
+++ b/pkgs/applications/misc/font-manager/default.nix
@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, makeWrapper, automake, autoconf, libtool,
+{ stdenv, fetchFromGitHub, automake, autoconf, libtool,
  pkgconfig, file, intltool, libxml2, json_glib , sqlite, itstool,
-  librsvg, vala_0_34, gnome3, wrapGAppsHook
+  librsvg, vala_0_34, gnome3, wrapGAppsHook, gobjectIntrospection
 }:

 stdenv.mkDerivation rec {
@ -15,7 +15,6 @@ stdenv.mkDerivation rec {
    };

  nativeBuildInputs = [
-    makeWrapper
    pkgconfig
    automake autoconf libtool
    file
@ -23,6 +22,8 @@ stdenv.mkDerivation rec {
    vala_0_34
    gnome3.yelp_tools
    wrapGAppsHook
+    # For setup hook
+    gobjectIntrospection
  ];

  buildInputs = [
--- a/pkgs/applications/misc/kupfer/default.nix
+++ b/pkgs/applications/misc/kupfer/default.nix
@ -3,6 +3,7 @@
 , fetchurl
 , intltool
 , python3Packages
+, gobjectIntrospection
 , gtk3
 , dbus
 , libwnck3
@ -22,7 +23,11 @@ buildPythonApplication rec {
    sha256 = "0c9xjx13r8ckfr4az116bhxsd3pk78v04c3lz6lqhraak0rp4d92";
  };

-  nativeBuildInputs = [ wrapGAppsHook intltool ];
+  nativeBuildInputs = [
+    wrapGAppsHook intltool
+    # For setup hook
+    gobjectIntrospection
+  ];
  buildInputs = [ hicolor_icon_theme docutils libwnck3 keybinder3 ];
  propagatedBuildInputs = [ pygobject3 gtk3 pyxdg dbus-python pycairo ];

--- a/pkgs/applications/misc/pdfpc/default.nix
+++ b/pkgs/applications/misc/pdfpc/default.nix
@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, cmake, makeWrapper, pkgconfig, vala, gtk3, libgee
-, poppler, libpthreadstubs, gstreamer, gst-plugins-base, librsvg, pcre }:
+, poppler, libpthreadstubs, gstreamer, gst-plugins-base, librsvg, pcre, gobjectIntrospection }:

 stdenv.mkDerivation rec {
  name = "${product}-${version}";
@ -13,7 +13,11 @@ stdenv.mkDerivation rec {
    sha256 = "00qfmmk8h762p53z46g976z7j4fbxyi16w5axzsv1ymvdq95ds8c";
  };

-  nativeBuildInputs = [ cmake pkgconfig vala ];
+  nativeBuildInputs = [
+    cmake pkgconfig vala
+    # For setup hook
+    gobjectIntrospection
+  ];
  buildInputs = [ gstreamer gst-plugins-base gtk3 libgee poppler
    libpthreadstubs makeWrapper librsvg pcre ];

--- a/pkgs/applications/misc/synapse/default.nix
+++ b/pkgs/applications/misc/synapse/default.nix
@ -1,5 +1,5 @@
 { stdenv, fetchurl, intltool, pkgconfig, glib, libnotify, gtk3, libgee
-, keybinder3, json_glib, zeitgeist, vala_0_34, hicolor_icon_theme
+, keybinder3, json_glib, zeitgeist, vala_0_34, hicolor_icon_theme, gobjectIntrospection
 }:

 let
@ -12,7 +12,11 @@ in stdenv.mkDerivation rec {
    sha256 = "04cnsmwf9xa52dh7rpb4ia715c0ls8jg1p7llc9yf3lbg1m0bvzv";
  };

-  nativeBuildInputs = [ pkgconfig intltool vala_0_34 ];
+  nativeBuildInputs = [
+    pkgconfig intltool vala_0_34
+    # For setup hook
+    gobjectIntrospection
+  ];
  buildInputs = [
    glib libnotify gtk3 libgee keybinder3 json_glib zeitgeist
    hicolor_icon_theme
--- a/pkgs/applications/misc/valauncher/default.nix
+++ b/pkgs/applications/misc/valauncher/default.nix
@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, gtk3, vala, pkgconfig, gnome3 }:
+{ stdenv, fetchFromGitHub, cmake, gtk3, vala, pkgconfig, gnome3, gobjectIntrospection }:

 stdenv.mkDerivation rec {
  version = "1.3.1";
@ -11,8 +11,12 @@ stdenv.mkDerivation rec {
    sha256 = "18969v870737jg1q0l3d05pb9mxsrcpdi0mnyz94rwkspszvxxqi";
  };

-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ cmake gtk3 vala gnome3.libgee ];
+  nativeBuildInputs = [
+    cmake vala pkgconfig
+    # For setup hook
+    gobjectIntrospection
+  ];
+  buildInputs = [ gtk3 gnome3.libgee ];

  meta = with stdenv.lib; {
      description = "A fast dmenu-like gtk3 application launcher";
--- a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
@ -1,12 +1,12 @@
 { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, intltool, gjs, gdk_pixbuf, librsvg }:
+, intltool, gobjectIntrospection, gjs, gdk_pixbuf, librsvg }:

 stdenv.mkDerivation rec {
  inherit (import ./src.nix fetchurl) name src;

-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkgconfig wrapGAppsHook intltool ];
  buildInputs = [
-    gtk3 wrapGAppsHook intltool gjs gdk_pixbuf
+    gtk3 gjs gdk_pixbuf gobjectIntrospection
    librsvg gnome3.gsettings_desktop_schemas gnome3.defaultIconTheme
  ];

--- a/pkgs/desktops/gnome-3/core/eog/default.nix
+++ b/pkgs/desktops/gnome-3/core/eog/default.nix
@ -1,10 +1,10 @@
 { fetchurl, stdenv, gettext, pkgconfig, itstool, libxml2, libjpeg, gnome3
-, shared_mime_info, wrapGAppsHook, librsvg, libexif }:
+, shared_mime_info, wrapGAppsHook, librsvg, libexif, gobjectIntrospection }:

 stdenv.mkDerivation rec {
  inherit (import ./src.nix fetchurl) name src;

-  nativeBuildInputs = [ pkgconfig gettext itstool wrapGAppsHook ];
+  nativeBuildInputs = [ pkgconfig gettext itstool wrapGAppsHook gobjectIntrospection ];

  buildInputs = with gnome3;
    [ libxml2 libjpeg gtk glib libpeas librsvg
--- a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix
@ -1,10 +1,10 @@
 { stdenv, fetchurl, gnome3, meson, ninja, pkgconfig, gtk3, intltool, glib
-, udev, itstool, libxml2, wrapGAppsHook, libnotify, libcanberra_gtk3 }:
+, udev, itstool, libxml2, wrapGAppsHook, libnotify, libcanberra_gtk3, gobjectIntrospection }:

 stdenv.mkDerivation rec {
  inherit (import ./src.nix fetchurl) name src;

-  nativeBuildInputs = [ meson ninja intltool itstool pkgconfig libxml2 wrapGAppsHook ];
+  nativeBuildInputs = [ meson ninja intltool itstool pkgconfig libxml2 wrapGAppsHook gobjectIntrospection ];
  buildInputs = [ glib gtk3 udev libnotify libcanberra_gtk3
                  gnome3.defaultIconTheme gnome3.gsettings_desktop_schemas ];

--- a/pkgs/desktops/gnome-3/core/gtksourceview/default.nix
+++ b/pkgs/desktops/gnome-3/core/gtksourceview/default.nix
@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk3, pango
-, libxml2, perl, intltool, gettext, gnome3, dbus, xvfb_run, shared_mime_info }:
+, libxml2, perl, intltool, gettext, gnome3, gobjectIntrospection, dbus, xvfb_run, shared_mime_info }:

 stdenv.mkDerivation rec {
  inherit (import ./src.nix fetchurl) name src;
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {

  outputs = [ "out" "dev" ];

-  nativeBuildInputs = [ pkgconfig intltool gettext perl ]
+  nativeBuildInputs = [ pkgconfig intltool gettext perl gobjectIntrospection ]
    ++ stdenv.lib.optionals doCheck checkInputs;
  buildInputs = [ atk cairo glib pango libxml2 ];
  checkInputs = [ xvfb_run dbus ];
--- a/pkgs/desktops/gnome-3/core/gucharmap/default.nix
+++ b/pkgs/desktops/gnome-3/core/gucharmap/default.nix
@ -1,7 +1,7 @@
 { stdenv, intltool, fetchurl, pkgconfig, gtk3
 , glib, desktop_file_utils, bash, appdata-tools
 , wrapGAppsHook, gnome3, itstool, libxml2
-, callPackage, unzip }:
+, callPackage, unzip, gobjectIntrospection }:

 # TODO: icons and theme still does not work
 # use packaged gnome3.adwaita-icon-theme
@ -15,11 +15,12 @@ stdenv.mkDerivation rec {

  preConfigure = "patchShebangs gucharmap/gen-guch-unicode-tables.pl";

-  nativeBuildInputs = [ pkgconfig wrapGAppsHook unzip ];
+  nativeBuildInputs = [
+    pkgconfig wrapGAppsHook unzip intltool itstool appdata-tools
+    gnome3.yelp_tools libxml2 desktop_file_utils gobjectIntrospection
+  ];

-  buildInputs = [ gtk3 intltool itstool glib appdata-tools
-                  gnome3.yelp_tools libxml2 desktop_file_utils
-                  gnome3.gsettings_desktop_schemas ];
+  buildInputs = [ gtk3 glib gnome3.gsettings_desktop_schemas ];

  unicode-data = callPackage ./unicode-data.nix {};

--- a/pkgs/desktops/gnome-3/core/libpeas/default.nix
+++ b/pkgs/desktops/gnome-3/core/libpeas/default.nix
@ -8,7 +8,11 @@ stdenv.mkDerivation rec {
  configureFlags = [ "--enable-python3" ];

  nativeBuildInputs = [ pkgconfig ];
-  buildInputs =  [ intltool glib gtk3 gnome3.defaultIconTheme ncurses python3Packages.python python3Packages.pygobject3 gobjectIntrospection ];
+  buildInputs =  [ intltool glib gtk3 gnome3.defaultIconTheme ncurses python3Packages.python python3Packages.pygobject3 ];
+  propagatedBuildInputs = [
+    # Required by libpeas-1.0.pc
+    gobjectIntrospection
+  ];

  meta = with stdenv.lib; {
    description = "A GObject-based plugins engine";
--- a/pkgs/desktops/gnome-3/core/simple-scan/default.nix
+++ b/pkgs/desktops/gnome-3/core/simple-scan/default.nix
@ -1,13 +1,17 @@
 { stdenv, fetchurl, meson, ninja, pkgconfig, gettext, itstool, wrapGAppsHook
 , cairo, gdk_pixbuf, colord, glib, gtk, gusb, packagekit, libwebp
-, libxml2, sane-backends, vala, gnome3 }:
+, libxml2, sane-backends, vala, gnome3, gobjectIntrospection }:

 stdenv.mkDerivation rec {
  inherit (import ./src.nix fetchurl) name src;

  buildInputs = [ cairo gdk_pixbuf colord glib gnome3.defaultIconTheme gusb
                gtk libwebp packagekit sane-backends vala ];
-  nativeBuildInputs = [ meson ninja gettext itstool pkgconfig wrapGAppsHook libxml2 ];
+  nativeBuildInputs = [
+    meson ninja gettext itstool pkgconfig wrapGAppsHook libxml2
+    # For setup hook
+    gobjectIntrospection
+  ];

  postPatch = ''
    patchShebangs data/meson_compile_gschema.py
--- a/pkgs/desktops/gnome-3/misc/gspell/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gspell/default.nix
@ -1,11 +1,11 @@
-{ stdenv, fetchurl, pkgconfig, glib, gtk3, enchant, isocodes, vala }:
+{ stdenv, fetchurl, pkgconfig, glib, gtk3, enchant, isocodes, vala, gobjectIntrospection }:

 stdenv.mkDerivation rec {
  inherit (import ./src.nix fetchurl) name src;

  propagatedBuildInputs = [ enchant ]; # required for pkgconfig

-  nativeBuildInputs = [ pkgconfig vala ];
+  nativeBuildInputs = [ pkgconfig vala gobjectIntrospection ];
  buildInputs = [ glib gtk3 isocodes ];

  meta = with stdenv.lib; {
--- a/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix
+++ b/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix
@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, cmake, vala_0_38, pkgconfig, glib, gtk3, granite, gnome3, libnotify, gettext, makeWrapper }:
+{ stdenv, fetchurl, perl, cmake, vala_0_38, pkgconfig, glib, gtk3, granite, gnome3, libnotify, gettext, makeWrapper, gobjectIntrospection }:

 stdenv.mkDerivation rec {
  majorVersion = "0.4";
@ -20,7 +20,11 @@ stdenv.mkDerivation rec {
    done
  '';

-  nativeBuildInputs = [ perl cmake vala_0_38 pkgconfig makeWrapper ];
+  nativeBuildInputs = [
+    perl cmake vala_0_38 pkgconfig makeWrapper
+    # For setup hook
+    gobjectIntrospection
+  ];
  buildInputs = with gnome3; [
    glib gtk3 granite libnotify gettext vte_290 libgee
    gsettings_desktop_schemas defaultIconTheme
--- a/pkgs/development/libraries/atk/default.nix
+++ b/pkgs/development/libraries/atk/default.nix
@ -18,13 +18,11 @@ stdenv.mkDerivation rec {

  buildInputs = libintlOrEmpty;

-  nativeBuildInputs = [ pkgconfig perl ];
+  nativeBuildInputs = [ pkgconfig perl gobjectIntrospection ];

  propagatedBuildInputs = [
    # Required by atk.pc
    glib
-    # TODO: Why propagate?
-    gobjectIntrospection
  ];

  doCheck = true;
--- a/pkgs/development/libraries/gtk+/2.x.nix
+++ b/pkgs/development/libraries/gtk+/2.x.nix
@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, gettext, glib, atk, pango, cairo, perl, xorg
-, gdk_pixbuf, libintlOrEmpty, xlibsWrapper
+, gdk_pixbuf, libintlOrEmpty, xlibsWrapper, gobjectIntrospection
 , xineramaSupport ? stdenv.isLinux
 , cupsSupport ? true, cups ? null
 , gdktarget ? "x11"
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {

  setupHook = ./setup-hook.sh;

-  nativeBuildInputs = [ setupHook perl pkgconfig gettext ];
+  nativeBuildInputs = [ setupHook perl pkgconfig gettext gobjectIntrospection ];

  patches = [ ./2.0-immodules.cache.patch ./gtk2-theme-paths.patch ];

--- a/pkgs/development/ruby-modules/gem-config/default.nix
+++ b/pkgs/development/ruby-modules/gem-config/default.nix
@ -109,7 +109,7 @@ in

  gio2 = attrs: {
    nativeBuildInputs = [ pkgconfig ];
-    buildInputs = [ gtk2 pcre ];
+    buildInputs = [ gtk2 pcre gobjectIntrospection ];
  };

  gitlab-markup = attrs: { meta.priority = 1; };
--- a/pkgs/development/tools/misc/d-feet/default.nix
+++ b/pkgs/development/tools/misc/d-feet/default.nix
@ -1,5 +1,5 @@
 { stdenv, pkgconfig, fetchurl, itstool, intltool, libxml2, glib, gtk3
-, python3Packages, wrapGAppsHook, gnome3, libwnck3 }:
+, python3Packages, wrapGAppsHook, gnome3, libwnck3, gobjectIntrospection }:

 let
  version = "${major}.13";
@ -14,7 +14,7 @@ in python3Packages.buildPythonApplication rec {
  };

  nativeBuildInputs = [ pkgconfig itstool intltool wrapGAppsHook libxml2 ];
-  buildInputs = [ glib gtk3 gnome3.defaultIconTheme libwnck3 ];
+  buildInputs = [ glib gtk3 gnome3.defaultIconTheme libwnck3 gobjectIntrospection ];

  propagatedBuildInputs = with python3Packages; [ pygobject3 pep8 ];