gnome3.gtk -> gtk3

fix evaluation when config.allowAliases == false (regression after #55735)
2019-03-09 11:41:12 +00:00 · 2019-03-09 11:41:12 +00:00 · 2be90ccb4f
commit 2be90ccb4f
parent 5bf6a13417
24 changed files with 53 additions and 55 deletions
--- a/pkgs/applications/audio/reaper/default.nix
+++ b/pkgs/applications/audio/reaper/default.nix
@ -1,6 +1,6 @@
 { stdenv, fetchurl, autoPatchelfHook, makeWrapper
 , alsaLib, xorg
-, gnome3, pango, gdk_pixbuf, cairo, glib, freetype
+, gnome3, gtk3, pango, gdk_pixbuf, cairo, glib, freetype
 , libpulseaudio, xdg_utils
 }:

@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
  ];

  runtimeDependencies = [
-    gnome3.gtk
+    gtk3
  ];

  dontBuild = true;
--- a/pkgs/applications/misc/gxmessage/default.nix
+++ b/pkgs/applications/misc/gxmessage/default.nix
@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gnome3, intltool, pkgconfig, texinfo, hicolor-icon-theme }:
+{ stdenv, fetchurl, gtk3, intltool, pkgconfig, texinfo, hicolor-icon-theme }:

 stdenv.mkDerivation rec {
  name = "gxmessage-${version}";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
  };

  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ intltool gnome3.gtk texinfo hicolor-icon-theme ];
+  buildInputs = [ intltool gtk3 texinfo hicolor-icon-theme ];

  meta = {
    description = "A GTK enabled dropin replacement for xmessage";
--- a/pkgs/applications/search/catfish/default.nix
+++ b/pkgs/applications/search/catfish/default.nix
@ -1,5 +1,5 @@
 { stdenv, fetchurl, file, which, intltool, gobject-introspection,
-  findutils, xdg_utils, gnome3, pythonPackages, hicolor-icon-theme,
+  findutils, xdg_utils, gnome3, gtk3, pythonPackages, hicolor-icon-theme,
  wrapGAppsHook
 }:

@ -24,7 +24,7 @@ pythonPackages.buildPythonApplication rec {
  ];

  buildInputs = [
-    gnome3.gtk
+    gtk3
    gnome3.dconf
    pythonPackages.pyxdg
    pythonPackages.ptyprocess
--- a/pkgs/applications/video/lightworks/default.nix
+++ b/pkgs/applications/video/lightworks/default.nix
@ -1,11 +1,11 @@
 { stdenv, fetchurl, dpkg, makeWrapper, buildFHSUserEnv
-, gnome3, gdk_pixbuf, cairo, libjpeg_original, glib, gnome2, libGLU
+, gnome3, gtk3, gdk_pixbuf, cairo, libjpeg_original, glib, gnome2, libGLU
 , nvidia_cg_toolkit, zlib, openssl, portaudio
 }:
 let
  fullPath = stdenv.lib.makeLibraryPath [
    stdenv.cc.cc
-    gnome3.gtk
+    gtk3
    gdk_pixbuf
    cairo
    libjpeg_original
--- a/pkgs/applications/video/subtitleeditor/default.nix
+++ b/pkgs/applications/video/subtitleeditor/default.nix
@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, intltool, file,
-  desktop-file-utils, enchant, gnome3, gst_all_1, hicolor-icon-theme,
+  desktop-file-utils, enchant, gnome3, gtk3, gst_all_1, hicolor-icon-theme,
  libsigcxx, libxmlxx, xdg_utils, isocodes, wrapGAppsHook
 }:

@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
  buildInputs =  [
    desktop-file-utils
    enchant
-    gnome3.gtk
+    gtk3
    gnome3.gtkmm
    gst_all_1.gstreamer
    gst_all_1.gstreamermm
--- a/pkgs/desktops/deepin/deepin-metacity/default.nix
+++ b/pkgs/desktops/deepin/deepin-metacity/default.nix
@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgconfig, intltool, libtool, gnome3, bamf,
+{ stdenv, fetchFromGitHub, pkgconfig, intltool, libtool, gnome3, gtk3, bamf,
  json-glib, libcanberra-gtk3, libxkbcommon, libstartup_notification,
  deepin-wallpapers, deepin-desktop-schemas, deepin }:

@ -24,7 +24,7 @@ stdenv.mkDerivation rec {

  buildInputs = [
    gnome3.dconf
-    gnome3.gtk
+    gtk3
    gnome3.libgtop
    gnome3.zenity
    bamf
--- a/pkgs/desktops/deepin/deepin-mutter/default.nix
+++ b/pkgs/desktops/deepin/deepin-mutter/default.nix
@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgconfig, intltool, libtool, gnome3, xorg,
+{ stdenv, fetchFromGitHub, pkgconfig, intltool, libtool, gnome3, gtk3, xorg,
  libcanberra-gtk3, upower, xkeyboard_config, libxkbcommon,
  libstartup_notification, libinput, cogl, clutter, systemd, deepin }:

@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
  ];

  buildInputs = [
-    gnome3.gtk
+    gtk3
    gnome3.gnome-desktop
    gnome3.gsettings-desktop-schemas
    gnome3.libgudev
--- a/pkgs/desktops/mate/engrampa/default.nix
+++ b/pkgs/desktops/mate/engrampa/default.nix
@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gnome3, mate, hicolor-icon-theme, wrapGAppsHook }:
+{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gnome3, gtk3, mate, hicolor-icon-theme, wrapGAppsHook }:

 stdenv.mkDerivation rec {
  name = "engrampa-${version}";
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {

  buildInputs = [
    libxml2
-    gnome3.gtk
+    gtk3
    mate.caja
    hicolor-icon-theme
    mate.mate-desktop
--- a/pkgs/desktops/mate/eom/default.nix
+++ b/pkgs/desktops/mate/eom/default.nix
@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, itstool, dbus-glib, exempi, lcms2, libexif, libjpeg, librsvg, libxml2, shared-mime-info, gnome3, mate, hicolor-icon-theme, wrapGAppsHook }:
+{ stdenv, fetchurl, pkgconfig, intltool, itstool, dbus-glib, exempi, lcms2, libexif, libjpeg, librsvg, libxml2, shared-mime-info, gnome3, gtk3, mate, hicolor-icon-theme, wrapGAppsHook }:

 stdenv.mkDerivation rec {
  name = "eom-${version}";
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
    librsvg
    libxml2
    shared-mime-info
-    gnome3.gtk
+    gtk3
    gnome3.libpeas
    mate.mate-desktop
    hicolor-icon-theme
--- a/pkgs/desktops/mate/marco/default.nix
+++ b/pkgs/desktops/mate/marco/default.nix
@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, libcanberra-gtk3, libgtop, gnome2, gnome3, mate, wrapGAppsHook }:
+{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, libcanberra-gtk3, libgtop, gnome2, gnome3, gtk3, mate, wrapGAppsHook }:

 stdenv.mkDerivation rec {
  name = "marco-${version}";
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
    libcanberra-gtk3
    libgtop
    gnome2.startup_notification
-    gnome3.gtk
+    gtk3
    gnome3.zenity
  ];

--- a/pkgs/desktops/mate/mate-applets/default.nix
+++ b/pkgs/desktops/mate/mate-applets/default.nix
@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, itstool, gnome3, libwnck3, libgtop, libxml2, libnotify, polkit, upower, wirelesstools, mate, hicolor-icon-theme, wrapGAppsHook }:
+{ stdenv, fetchurl, pkgconfig, intltool, itstool, gnome3, gtk3, libwnck3, libgtop, libxml2, libnotify, polkit, upower, wirelesstools, mate, hicolor-icon-theme, wrapGAppsHook }:

 stdenv.mkDerivation rec {
  name = "mate-applets-${version}";
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
  ];

  buildInputs = [
-    gnome3.gtk
+    gtk3
    gnome3.gtksourceview
    gnome3.gucharmap
    libwnck3
--- a/pkgs/desktops/mate/mate-control-center/default.nix
+++ b/pkgs/desktops/mate/mate-control-center/default.nix
@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, dbus-glib,
  libxklavier, libcanberra-gtk3, librsvg, libappindicator-gtk3,
-  desktop-file-utils, gnome3, mate, hicolor-icon-theme, wrapGAppsHook
+  desktop-file-utils, gnome3, gtk3, mate, hicolor-icon-theme, wrapGAppsHook
 }:

 stdenv.mkDerivation rec {
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
    libcanberra-gtk3
    librsvg
    libappindicator-gtk3
-    gnome3.gtk
+    gtk3
    gnome3.dconf
    hicolor-icon-theme
    mate.mate-desktop
--- a/pkgs/desktops/mate/mate-desktop/default.nix
+++ b/pkgs/desktops/mate/mate-desktop/default.nix
@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gnome3, mate, wrapGAppsHook }:
+{ stdenv, fetchurl, pkgconfig, intltool, gnome3, gtk3, mate, wrapGAppsHook }:

 stdenv.mkDerivation rec {
  name = "mate-desktop-${version}";
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {

  buildInputs = [
    gnome3.dconf
-    gnome3.gtk
+    gtk3
  ];

  meta = with stdenv.lib; {
--- a/pkgs/desktops/mate/mate-media/default.nix
+++ b/pkgs/desktops/mate/mate-media/default.nix
@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, libtool, libxml2, libcanberra-gtk3, gnome3, mate, wrapGAppsHook }:
+{ stdenv, fetchurl, pkgconfig, intltool, libtool, libxml2, libcanberra-gtk3, gnome3, gtk3, mate, wrapGAppsHook }:

 stdenv.mkDerivation rec {
  name = "mate-media-${version}";
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
  buildInputs = [
    libxml2
    libcanberra-gtk3
-    gnome3.gtk
+    gtk3
    mate.libmatemixer
    mate.mate-desktop
  ];
--- a/pkgs/desktops/mate/mate-notification-daemon/default.nix
+++ b/pkgs/desktops/mate/mate-notification-daemon/default.nix
@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, intltool, dbus-glib, libcanberra-gtk3,
-  libnotify, libwnck3, gnome3, mate, wrapGAppsHook }:
+  libnotify, libwnck3, gnome3, gtk3, mate, wrapGAppsHook }:

 stdenv.mkDerivation rec {
  name = "mate-notification-daemon-${version}";
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
    libcanberra-gtk3
    libnotify
    libwnck3
-    gnome3.gtk
+    gtk3
  ];

  meta = with stdenv.lib; {
--- a/pkgs/desktops/mate/mate-panel/default.nix
+++ b/pkgs/desktops/mate/mate-panel/default.nix
@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, itstool, glib, dbus-glib, libwnck3, librsvg, libxml2, gnome3, mate, hicolor-icon-theme, gobject-introspection, wrapGAppsHook }:
+{ stdenv, fetchurl, pkgconfig, intltool, itstool, glib, dbus-glib, libwnck3, librsvg, libxml2, gnome3, gtk3, mate, hicolor-icon-theme, gobject-introspection, wrapGAppsHook }:

 stdenv.mkDerivation rec {
  name = "mate-panel-${version}";
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
    libwnck3
    librsvg
    libxml2
-    gnome3.gtk
+    gtk3
    gnome3.dconf
    mate.libmateweather
    mate.mate-desktop
--- a/pkgs/desktops/mate/mate-power-manager/default.nix
+++ b/pkgs/desktops/mate/mate-power-manager/default.nix
@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, glib, itstool, libxml2, mate, libnotify, libcanberra-gtk3, dbus-glib, upower, gnome3, libtool, wrapGAppsHook }:
+{ stdenv, fetchurl, pkgconfig, intltool, glib, itstool, libxml2, mate, libnotify, libcanberra-gtk3, dbus-glib, upower, gnome3, gtk3, libtool, wrapGAppsHook }:

 stdenv.mkDerivation rec {
  name = "mate-power-manager-${version}";
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     itstool
     libxml2
     libcanberra-gtk3
-     gnome3.gtk
+     gtk3
     gnome3.libgnome-keyring
     libnotify
     dbus-glib
--- a/pkgs/desktops/mate/mate-settings-daemon/default.nix
+++ b/pkgs/desktops/mate/mate-settings-daemon/default.nix
@ -1,6 +1,5 @@
-{ config, stdenv, fetchurl, pkgconfig, intltool, dbus-glib, libxklavier
-, libcanberra-gtk3, libnotify, nss, polkit, gnome3, mate, wrapGAppsHook
-, pulseaudioSupport ? config.pulseaudio or true, libpulseaudio
+{ stdenv, fetchurl, pkgconfig, intltool, dbus-glib, libxklavier, libcanberra-gtk3, libnotify, nss, polkit, gnome3, gtk3, mate, wrapGAppsHook
+, pulseaudioSupport ? stdenv.config.pulseaudio or true, libpulseaudio
 }:

 stdenv.mkDerivation rec {
@ -25,7 +24,7 @@ stdenv.mkDerivation rec {
    libnotify
    nss
    polkit
-    gnome3.gtk
+    gtk3
    gnome3.dconf
    mate.mate-desktop
    mate.libmatekbd
--- a/pkgs/development/libraries/tepl/default.nix
+++ b/pkgs/development/libraries/tepl/default.nix
@ -1,5 +1,5 @@
 { stdenv, fetchurl
-, amtk, gnome3, gtksourceview4, libuchardet, libxml2, pkgconfig }:
+, amtk, gnome3, gtk3, gtksourceview4, libuchardet, libxml2, pkgconfig }:
 let
  version = "4.2.0";
  pname = "tepl";
@ -20,7 +20,7 @@ in stdenv.mkDerivation {
    libxml2
    gtksourceview4
    libuchardet
-    gnome3.gtk
+    gtk3
  ];

  doCheck = false;
--- a/pkgs/development/python-modules/xdot/default.nix
+++ b/pkgs/development/python-modules/xdot/default.nix
@ -1,5 +1,5 @@
 { lib, buildPythonPackage, fetchPypi, isPy3k
-, wrapGAppsHook, gobject-introspection, pygobject3, graphviz, gnome3 }:
+, wrapGAppsHook, gobject-introspection, pygobject3, graphviz, gnome3, gtk3 }:

 buildPythonPackage rec {
  pname = "xdot";
@ -13,7 +13,7 @@ buildPythonPackage rec {
  disabled = !isPy3k;

  nativeBuildInputs = [ wrapGAppsHook ];
-  propagatedBuildInputs = [ gobject-introspection pygobject3 graphviz gnome3.gtk ];
+  propagatedBuildInputs = [ gobject-introspection pygobject3 graphviz gtk3 ];

  meta = with lib; {
    description = "xdot.py is an interactive viewer for graphs written in Graphviz's dot";
--- a/pkgs/tools/audio/gvolicon/default.nix
+++ b/pkgs/tools/audio/gvolicon/default.nix
@ -1,4 +1,4 @@
-{ stdenv, makeWrapper, alsaLib, pkgconfig, fetchgit, gnome3, gdk_pixbuf, librsvg, wrapGAppsHook }:
+{ stdenv, makeWrapper, alsaLib, pkgconfig, fetchgit, gtk3, gnome3, gdk_pixbuf, librsvg, wrapGAppsHook }:

 stdenv.mkDerivation {
  name = "gvolicon-2014-04-28";
@ -10,7 +10,7 @@ stdenv.mkDerivation {

  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [
-    makeWrapper alsaLib gnome3.gtk gdk_pixbuf gnome3.adwaita-icon-theme
+    makeWrapper alsaLib gtk3 gdk_pixbuf gnome3.adwaita-icon-theme
    librsvg wrapGAppsHook
  ];

--- a/pkgs/tools/graphics/luxcorerender/default.nix
+++ b/pkgs/tools/graphics/luxcorerender/default.nix
@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, boost165, pkgconfig, python35
 , tbb, openimageio, libjpeg, libpng, zlib, libtiff, ilmbase
 , freetype, openexr, libXdmcp, libxkbcommon, epoxy, at-spi2-core
-, dbus, doxygen, qt5, c-blosc, libGLU, gnome3, pcre
+, dbus, doxygen, qt5, c-blosc, libGLU, gnome3, gtk3, pcre
 , bison, flex, libpthreadstubs, libX11
 , embree2, makeWrapper, gsettings-desktop-schemas, glib
 , withOpenCL ? true , opencl-headers, ocl-icd, opencl-clhpp
@ -31,7 +31,7 @@ in stdenv.mkDerivation rec {
     flex libX11 libpthreadstubs python35 libXdmcp libxkbcommon
     epoxy at-spi2-core dbus doxygen
     # needed for GSETTINGS_SCHEMAS_PATH
-     gsettings-desktop-schemas glib gnome3.gtk
+     gsettings-desktop-schemas glib gtk3
     # needed for XDG_ICON_DIRS
     gnome3.adwaita-icon-theme
     makeWrapper
--- a/pkgs/tools/networking/network-manager/strongswan.nix
+++ b/pkgs/tools/networking/network-manager/strongswan.nix
@ -1,5 +1,5 @@
 { stdenv, fetchurl, intltool, pkgconfig, networkmanager, strongswanNM
-, gnome3, libsecret }:
+, gtk3, gnome3, libsecret }:

 stdenv.mkDerivation rec {
  name = "${pname}-${version}";
@ -11,8 +11,7 @@ stdenv.mkDerivation rec {
    sha256 = "1xhj5cipwbihf0cna8lpicpz7cd8fgkagpmg0xvj6pshymm5jbcd";
  };

-  buildInputs = [ networkmanager strongswanNM libsecret ]
-    ++ (with gnome3; [ gtk networkmanagerapplet ]);
+  buildInputs = [ networkmanager strongswanNM libsecret gtk3 gnome3.networkmanagerapplet ];

  nativeBuildInputs = [ intltool pkgconfig ];

--- a/pkgs/tools/networking/uget/default.nix
+++ b/pkgs/tools/networking/uget/default.nix
@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, intltool, openssl, curl, libnotify,
-  libappindicator-gtk3, gst_all_1, gnome3, wrapGAppsHook, aria2 ? null
+  libappindicator-gtk3, gst_all_1, gtk3, gnome3, wrapGAppsHook, aria2 ? null
 }:

 stdenv.mkDerivation rec {
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
    curl
    libnotify
    libappindicator-gtk3
-    gnome3.gtk
+    gtk3
    (stdenv.lib.getLib gnome3.dconf)
  ]
  ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good ])