diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix index cabebb6f18e9..8e2b096672c1 100644 --- 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; diff --git a/pkgs/applications/misc/gxmessage/default.nix b/pkgs/applications/misc/gxmessage/default.nix index 8401386ead49..a9e6d905c284 100644 --- 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"; diff --git a/pkgs/applications/search/catfish/default.nix b/pkgs/applications/search/catfish/default.nix index c2afda2d53d9..a0917d03ce11 100644 --- 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 diff --git a/pkgs/applications/video/lightworks/default.nix b/pkgs/applications/video/lightworks/default.nix index 4bfd9e790070..2b21a25434d5 100644 --- 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 @@ -21,7 +21,7 @@ let lightworks = stdenv.mkDerivation rec { version = "14.0.0"; name = "lightworks-${version}"; - + src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { diff --git a/pkgs/applications/video/subtitleeditor/default.nix b/pkgs/applications/video/subtitleeditor/default.nix index 3683973824a3..480552b001dc 100644 --- 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 diff --git a/pkgs/desktops/deepin/deepin-metacity/default.nix b/pkgs/desktops/deepin/deepin-metacity/default.nix index 78b6303188a2..dcc17a31e171 100644 --- 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 diff --git a/pkgs/desktops/deepin/deepin-mutter/default.nix b/pkgs/desktops/deepin/deepin-mutter/default.nix index be845d3c6bac..d2e29cd2cb8f 100644 --- 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 diff --git a/pkgs/desktops/mate/engrampa/default.nix b/pkgs/desktops/mate/engrampa/default.nix index 1989ac8e12cc..d6d189624f17 100644 --- 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 diff --git a/pkgs/desktops/mate/eom/default.nix b/pkgs/desktops/mate/eom/default.nix index 3b830f73c76a..bdf2bb051d15 100644 --- 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 diff --git a/pkgs/desktops/mate/marco/default.nix b/pkgs/desktops/mate/marco/default.nix index 975c80b1d0cf..8a707c78a510 100644 --- 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,10 +21,10 @@ stdenv.mkDerivation rec { libcanberra-gtk3 libgtop gnome2.startup_notification - gnome3.gtk + gtk3 gnome3.zenity ]; - + meta = with stdenv.lib; { description = "MATE default window manager"; homepage = https://github.com/mate-desktop/marco; diff --git a/pkgs/desktops/mate/mate-applets/default.nix b/pkgs/desktops/mate/mate-applets/default.nix index f9f0689fa65f..44a9077943a9 100644 --- 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 @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ]; configureFlags = [ "--enable-suid=no" ]; - + NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; meta = with stdenv.lib; { diff --git a/pkgs/desktops/mate/mate-control-center/default.nix b/pkgs/desktops/mate/mate-control-center/default.nix index 8697a150881b..d24198f5d7f4 100644 --- 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 diff --git a/pkgs/desktops/mate/mate-desktop/default.nix b/pkgs/desktops/mate/mate-desktop/default.nix index e6a43e6b457d..7d957e749b0b 100644 --- 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; { diff --git a/pkgs/desktops/mate/mate-media/default.nix b/pkgs/desktops/mate/mate-media/default.nix index 643f67cd1e95..90b97cd2bfb4 100644 --- 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 ]; diff --git a/pkgs/desktops/mate/mate-notification-daemon/default.nix b/pkgs/desktops/mate/mate-notification-daemon/default.nix index e9f8b4b75b1f..91ed947c97cc 100644 --- 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; { diff --git a/pkgs/desktops/mate/mate-panel/default.nix b/pkgs/desktops/mate/mate-panel/default.nix index a7d34fc85a64..64b6b333f5a3 100644 --- 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 diff --git a/pkgs/desktops/mate/mate-power-manager/default.nix b/pkgs/desktops/mate/mate-power-manager/default.nix index a9c162e59122..88f497f21de9 100644 --- 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 diff --git a/pkgs/desktops/mate/mate-settings-daemon/default.nix b/pkgs/desktops/mate/mate-settings-daemon/default.nix index 480304fcb1c6..3c47e50b9c82 100644 --- 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 diff --git a/pkgs/development/libraries/tepl/default.nix b/pkgs/development/libraries/tepl/default.nix index 7501f9ab6f15..0ca382baeca3 100644 --- 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; diff --git a/pkgs/development/python-modules/xdot/default.nix b/pkgs/development/python-modules/xdot/default.nix index 68d097d71d6a..79f0fb13d70d 100644 --- 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"; diff --git a/pkgs/tools/audio/gvolicon/default.nix b/pkgs/tools/audio/gvolicon/default.nix index f611055a4341..4a0c244f07f7 100644 --- 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 ]; diff --git a/pkgs/tools/graphics/luxcorerender/default.nix b/pkgs/tools/graphics/luxcorerender/default.nix index 3115b1b72439..ffba2280e8a5 100644 --- 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 diff --git a/pkgs/tools/networking/network-manager/strongswan.nix b/pkgs/tools/networking/network-manager/strongswan.nix index d7f558574065..17460bc72f70 100644 --- 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 ]; diff --git a/pkgs/tools/networking/uget/default.nix b/pkgs/tools/networking/uget/default.nix index 6779d864ce24..41c39cd27c26 100644 --- 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 { @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { intltool wrapGAppsHook ]; - + buildInputs = [ openssl curl libnotify libappindicator-gtk3 - gnome3.gtk + gtk3 (stdenv.lib.getLib gnome3.dconf) ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good ])