b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

gnome3.gtk -> gtk3

Browse source 
Fix building with `config.allowAliases = false;`.
This commit is contained in:
Samuel Gräfenstein 2021-03-16 22:00:50 +01:00
parent c8ef61d419
commit a4efd8c3e1
No known key found for this signature in database
GPG key ID: EF76A063F15C63C8
4 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/networking/p2p/transmission/default.nix
View file

@ -12,7 +12,7 @@
, pcre , pcre
# Build options # Build options
, enableGTK3 ? false , enableGTK3 ? false
, gnome3 , gtk3
, xorg , xorg
, wrapGAppsHook , wrapGAppsHook
, enableQt ? false , enableQt ? false
@ -65,7 +65,7 @@ in stdenv.mkDerivation {
pcre pcre
] ]
++ lib.optionals enableQt [ qt5.qttools qt5.qtbase ] ++ 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 enableSystemd [ systemd ]
++ lib.optionals stdenv.isLinux [ inotify-tools ] ++ lib.optionals stdenv.isLinux [ inotify-tools ]
; ;

6
pkgs/applications/networking/pcloud/default.nix
View file

@ -21,7 +21,7 @@
# Runtime dependencies; # Runtime dependencies;
# A few additional ones (e.g. Node) are already shipped together with the # A few additional ones (e.g. Node) are already shipped together with the
# AppImage, so we don't have to duplicate them here. # 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 let
@ -56,7 +56,7 @@ in stdenv.mkDerivation {
alsaLib alsaLib
dbus-glib dbus-glib
fuse fuse
gnome3.gtk gtk3
libdbusmenu-gtk2 libdbusmenu-gtk2
nss nss
udev udev
@ -92,7 +92,7 @@ in stdenv.mkDerivation {
# This is required for the file picker dialog - otherwise pcloud just # This is required for the file picker dialog - otherwise pcloud just
# crashes # 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" exec "$out/app/pcloud"
EOF EOF

4
pkgs/applications/video/webtorrent_desktop/default.nix
View file

@ -1,6 +1,6 @@
{ {
alsaLib, atk, cairo, cups, dbus, dpkg, expat, fetchurl, fetchzip, fontconfig, freetype, 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, libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender, libXtst,
libxcb, nspr, nss, lib, stdenv, udev, libuuid, pango, at-spi2-atk, at-spi2-core libxcb, nspr, nss, lib, stdenv, udev, libuuid, pango, at-spi2-atk, at-spi2-core
}: }:
@ -19,7 +19,7 @@
freetype freetype
gdk-pixbuf gdk-pixbuf
glib glib
gnome3.gtk gtk3
pango pango
libuuid libuuid
libX11 libX11

4
pkgs/applications/window-managers/wayfire/wcm.nix
View file

@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, meson, ninja, pkg-config, wayland, wrapGAppsHook { 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 { stdenv.mkDerivation rec {
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ meson ninja pkg-config wayland wrapGAppsHook ]; nativeBuildInputs = [ meson ninja pkg-config wayland wrapGAppsHook ];
buildInputs = [ buildInputs = [
gnome3.gtk libevdev libxml2 wayfire wayland gtk3 libevdev libxml2 wayfire wayland
wayland-protocols wf-config wf-shell wayland-protocols wf-config wf-shell
]; ];