From a4efd8c3e15dbb1e25670d3df3df484f1fd169f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20Gr=C3=A4fenstein?= Date: Tue, 16 Mar 2021 22:00:50 +0100 Subject: [PATCH] gnome3.gtk -> gtk3 Fix building with `config.allowAliases = false;`. --- pkgs/applications/networking/p2p/transmission/default.nix | 4 ++-- pkgs/applications/networking/pcloud/default.nix | 6 +++--- pkgs/applications/video/webtorrent_desktop/default.nix | 4 ++-- pkgs/applications/window-managers/wayfire/wcm.nix | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix index 8cc674b1ea7..7e8b6b671cd 100644 --- a/pkgs/applications/networking/p2p/transmission/default.nix +++ b/pkgs/applications/networking/p2p/transmission/default.nix @@ -12,7 +12,7 @@ , pcre # Build options , enableGTK3 ? false -, gnome3 +, gtk3 , xorg , wrapGAppsHook , enableQt ? false @@ -65,7 +65,7 @@ in stdenv.mkDerivation { pcre ] ++ lib.optionals enableQt [ qt5.qttools qt5.qtbase ] - ++ lib.optionals enableGTK3 [ gnome3.gtk xorg.libpthreadstubs ] + ++ lib.optionals enableGTK3 [ gtk3 xorg.libpthreadstubs ] ++ lib.optionals enableSystemd [ systemd ] ++ lib.optionals stdenv.isLinux [ inotify-tools ] ; diff --git a/pkgs/applications/networking/pcloud/default.nix b/pkgs/applications/networking/pcloud/default.nix index 4229fef4fe6..08a8bc98e1a 100644 --- a/pkgs/applications/networking/pcloud/default.nix +++ b/pkgs/applications/networking/pcloud/default.nix @@ -21,7 +21,7 @@ # Runtime dependencies; # A few additional ones (e.g. Node) are already shipped together with the # AppImage, so we don't have to duplicate them here. - alsaLib, dbus-glib, fuse, gnome3, libdbusmenu-gtk2, udev, nss + alsaLib, dbus-glib, fuse, gnome3, gtk3, libdbusmenu-gtk2, udev, nss }: let @@ -56,7 +56,7 @@ in stdenv.mkDerivation { alsaLib dbus-glib fuse - gnome3.gtk + gtk3 libdbusmenu-gtk2 nss udev @@ -92,7 +92,7 @@ in stdenv.mkDerivation { # This is required for the file picker dialog - otherwise pcloud just # crashes - export XDG_DATA_DIRS="${gnome3.gsettings-desktop-schemas}/share/gsettings-schemas/${gnome3.gsettings-desktop-schemas.name}:${gnome3.gtk}/share/gsettings-schemas/${gnome3.gtk.name}:$XDG_DATA_DIRS" + export XDG_DATA_DIRS="${gnome3.gsettings-desktop-schemas}/share/gsettings-schemas/${gnome3.gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS" exec "$out/app/pcloud" EOF diff --git a/pkgs/applications/video/webtorrent_desktop/default.nix b/pkgs/applications/video/webtorrent_desktop/default.nix index ac3dd320d3a..7660edcc768 100644 --- a/pkgs/applications/video/webtorrent_desktop/default.nix +++ b/pkgs/applications/video/webtorrent_desktop/default.nix @@ -1,6 +1,6 @@ { alsaLib, atk, cairo, cups, dbus, dpkg, expat, fetchurl, fetchzip, fontconfig, freetype, - gdk-pixbuf, glib, gnome3, libX11, libXScrnSaver, libXcomposite, libXcursor, + gdk-pixbuf, glib, gtk3, libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender, libXtst, libxcb, nspr, nss, lib, stdenv, udev, libuuid, pango, at-spi2-atk, at-spi2-core }: @@ -19,7 +19,7 @@ freetype gdk-pixbuf glib - gnome3.gtk + gtk3 pango libuuid libX11 diff --git a/pkgs/applications/window-managers/wayfire/wcm.nix b/pkgs/applications/window-managers/wayfire/wcm.nix index d6ac6aeb84e..9d524019ad5 100644 --- a/pkgs/applications/window-managers/wayfire/wcm.nix +++ b/pkgs/applications/window-managers/wayfire/wcm.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, meson, ninja, pkg-config, wayland, wrapGAppsHook -, gnome3, libevdev, libxml2, wayfire, wayland-protocols, wf-config, wf-shell +, gtk3, libevdev, libxml2, wayfire, wayland-protocols, wf-config, wf-shell }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkg-config wayland wrapGAppsHook ]; buildInputs = [ - gnome3.gtk libevdev libxml2 wayfire wayland + gtk3 libevdev libxml2 wayfire wayland wayland-protocols wf-config wf-shell ];