dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #319659 from jtojnar/gnome-extract

Browse Source 
Move various packages out of gnome scope
This commit is contained in:
Jan Tojnar 2024-07-02 08:03:53 +02:00 committed by GitHub
commit 0f56e32213
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
263 changed files with 609 additions and 678 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/languages-frameworks/gnome.section.md
View File

@ -143,7 +143,7 @@ You can also pass additional arguments to `makeWrapper` using `gappsWrapperArgs`
## Updating GNOME packages {#ssec-gnome-updating}
Most GNOME package offer [`updateScript`](#var-passthru-updateScript), it is therefore possible to update to latest source tarball by running `nix-shell maintainers/scripts/update.nix --argstr package gnome.nautilus` or even en masse with `nix-shell maintainers/scripts/update.nix --argstr path gnome`. Read the package’s `NEWS` file to see what changed.
Most GNOME package offer [`updateScript`](#var-passthru-updateScript), it is therefore possible to update to latest source tarball by running `nix-shell maintainers/scripts/update.nix --argstr package nautilus` or even en masse with `nix-shell maintainers/scripts/update.nix --argstr path gnome`. Read the package’s `NEWS` file to see what changed.
## Frequently encountered issues {#ssec-gnome-common-issues}

2
maintainers/scripts/update.nix
View File

@ -158,7 +158,7 @@ let
to run all update scripts for all packages that lists \`garbas\` as a maintainer
and have \`updateScript\` defined, or:
% nix-shell maintainers/scripts/update.nix --argstr package gnome.nautilus
% nix-shell maintainers/scripts/update.nix --argstr package nautilus
to run update script for specific package, or

2
nixos/modules/programs/file-roller.nix
View File

@ -14,7 +14,7 @@ in {
enable = lib.mkEnableOption "File Roller, an archive manager for GNOME";
package = lib.mkPackageOption pkgs [ "gnome" "file-roller" ] { };
package = lib.mkPackageOption pkgs "file-roller" { };
};

2
nixos/modules/programs/geary.nix
View File

@ -13,7 +13,7 @@ in {
};
config = lib.mkIf cfg.enable {
environment.systemPackages = [ pkgs.gnome.geary ];
environment.systemPackages = [ pkgs.geary ];
programs.dconf.enable = true;
services.gnome.gnome-keyring.enable = true;
services.gnome.gnome-online-accounts.enable = true;

4
nixos/modules/programs/gnome-disks.nix
View File

@ -32,9 +32,9 @@
config = lib.mkIf config.programs.gnome-disks.enable {
environment.systemPackages = [ pkgs.gnome.gnome-disk-utility ];
environment.systemPackages = [ pkgs.gnome-disk-utility ];
services.dbus.packages = [ pkgs.gnome.gnome-disk-utility ];
services.dbus.packages = [ pkgs.gnome-disk-utility ];
};

6
nixos/modules/programs/gnome-terminal.nix
View File

@ -19,9 +19,9 @@ in
};
config = lib.mkIf cfg.enable {
environment.systemPackages = [ pkgs.gnome.gnome-terminal ];
services.dbus.packages = [ pkgs.gnome.gnome-terminal ];
systemd.packages = [ pkgs.gnome.gnome-terminal ];
environment.systemPackages = [ pkgs.gnome-terminal ];
services.dbus.packages = [ pkgs.gnome-terminal ];
systemd.packages = [ pkgs.gnome-terminal ];
programs.bash.vteIntegration = true;
programs.zsh.vteIntegration = true;

10
nixos/modules/programs/gpaste.nix
View File

@ -18,12 +18,12 @@
###### implementation
config = lib.mkIf config.programs.gpaste.enable {
environment.systemPackages = [ pkgs.gnome.gpaste ];
services.dbus.packages = [ pkgs.gnome.gpaste ];
systemd.packages = [ pkgs.gnome.gpaste ];
environment.systemPackages = [ pkgs.gpaste ];
services.dbus.packages = [ pkgs.gpaste ];
systemd.packages = [ pkgs.gpaste ];
# gnome-control-center crashes in Keyboard Shortcuts pane without the GSettings schemas.
services.xserver.desktopManager.gnome.sessionPath = [ pkgs.gnome.gpaste ];
services.xserver.desktopManager.gnome.sessionPath = [ pkgs.gpaste ];
# gpaste-reloaded applet doesn't work without the typelib
services.xserver.desktopManager.cinnamon.sessionPath = [ pkgs.gnome.gpaste ];
services.xserver.desktopManager.cinnamon.sessionPath = [ pkgs.gpaste ];
};
}

2
nixos/modules/programs/nautilus-open-any-terminal.nix
View File

@ -19,7 +19,7 @@ in
config = lib.mkIf cfg.enable {
environment.systemPackages = with pkgs; [
gnome.nautilus-python
nautilus-python
nautilus-open-any-terminal
];
programs.dconf = lib.optionalAttrs (cfg.terminal != null) {

6
nixos/modules/programs/seahorse.nix
View File

@ -21,14 +21,14 @@
config = lib.mkIf config.programs.seahorse.enable {
programs.ssh.askPassword = lib.mkDefault "${pkgs.gnome.seahorse}/libexec/seahorse/ssh-askpass";
programs.ssh.askPassword = lib.mkDefault "${pkgs.seahorse}/libexec/seahorse/ssh-askpass";
environment.systemPackages = [
pkgs.gnome.seahorse
pkgs.seahorse
];
services.dbus.packages = [
pkgs.gnome.seahorse
pkgs.seahorse
];
};

6
nixos/modules/security/pam.nix
View File

@ -723,7 +723,7 @@ let
disable_interactive = true;
}; }
{ name = "kwallet"; enable = cfg.kwallet.enable; control = "optional"; modulePath = "${cfg.kwallet.package}/lib/security/pam_kwallet5.so"; }
{ name = "gnome_keyring"; enable = cfg.enableGnomeKeyring; control = "optional"; modulePath = "${pkgs.gnome.gnome-keyring}/lib/security/pam_gnome_keyring.so"; }
{ name = "gnome_keyring"; enable = cfg.enableGnomeKeyring; control = "optional"; modulePath = "${pkgs.gnome-keyring}/lib/security/pam_gnome_keyring.so"; }
{ name = "intune"; enable = config.services.intune.enable; control = "optional"; modulePath = "${pkgs.intune-portal}/lib/security/pam_intune.so"; }
{ name = "gnupg"; enable = cfg.gnupg.enable; control = "optional"; modulePath = "${pkgs.pam_gnupg}/lib/security/pam_gnupg.so"; settings = {
store-only = cfg.gnupg.storeOnly;
@ -789,7 +789,7 @@ let
{ name = "krb5"; enable = config.security.pam.krb5.enable; control = "sufficient"; modulePath = "${pam_krb5}/lib/security/pam_krb5.so"; settings = {
use_first_pass = true;
}; }
{ name = "gnome_keyring"; enable = cfg.enableGnomeKeyring; control = "optional"; modulePath = "${pkgs.gnome.gnome-keyring}/lib/security/pam_gnome_keyring.so"; settings = {
{ name = "gnome_keyring"; enable = cfg.enableGnomeKeyring; control = "optional"; modulePath = "${pkgs.gnome-keyring}/lib/security/pam_gnome_keyring.so"; settings = {
use_authtok = true;
}; }
];
@ -858,7 +858,7 @@ let
debug = true;
}; }
{ name = "kwallet"; enable = cfg.kwallet.enable; control = "optional"; modulePath = "${cfg.kwallet.package}/lib/security/pam_kwallet5.so"; }
{ name = "gnome_keyring"; enable = cfg.enableGnomeKeyring; control = "optional"; modulePath = "${pkgs.gnome.gnome-keyring}/lib/security/pam_gnome_keyring.so"; settings = {
{ name = "gnome_keyring"; enable = cfg.enableGnomeKeyring; control = "optional"; modulePath = "${pkgs.gnome-keyring}/lib/security/pam_gnome_keyring.so"; settings = {
auto_start = true;
}; }
{ name = "gnupg"; enable = cfg.gnupg.enable; control = "optional"; modulePath = "${pkgs.pam_gnupg}/lib/security/pam_gnupg.so"; settings = {

8
nixos/modules/services/desktops/gnome/gnome-keyring.nix
View File

@ -26,14 +26,14 @@ in
};
config = lib.mkIf cfg.enable {
environment.systemPackages = [ pkgs.gnome.gnome-keyring ];
environment.systemPackages = [ pkgs.gnome-keyring ];
services.dbus.packages = [
pkgs.gnome.gnome-keyring
pkgs.gnome-keyring
pkgs.gcr
];
xdg.portal.extraPortals = [ pkgs.gnome.gnome-keyring ];
xdg.portal.extraPortals = [ pkgs.gnome-keyring ];
security.pam.services = lib.mkMerge [
{
@ -52,7 +52,7 @@ in
owner = "root";
group = "root";
capabilities = "cap_ipc_lock=ep";
source = "${pkgs.gnome.gnome-keyring}/bin/gnome-keyring-daemon";
source = "${pkgs.gnome-keyring}/bin/gnome-keyring-daemon";
};
};
}

4
nixos/modules/services/desktops/gnome/gnome-user-share.nix
View File

@ -26,11 +26,11 @@
config = lib.mkIf config.services.gnome.gnome-user-share.enable {
environment.systemPackages = [
pkgs.gnome.gnome-user-share
pkgs.gnome-user-share
];
systemd.packages = [
pkgs.gnome.gnome-user-share
pkgs.gnome-user-share
];
};

8
nixos/modules/services/desktops/gnome/rygel.nix
View File

@ -23,12 +23,12 @@
###### implementation
config = lib.mkIf config.services.gnome.rygel.enable {
environment.systemPackages = [ pkgs.gnome.rygel ];
environment.systemPackages = [ pkgs.rygel ];
services.dbus.packages = [ pkgs.gnome.rygel ];
services.dbus.packages = [ pkgs.rygel ];
systemd.packages = [ pkgs.gnome.rygel ];
systemd.packages = [ pkgs.rygel ];
environment.etc."rygel.conf".source = "${pkgs.gnome.rygel}/etc/rygel.conf";
environment.etc."rygel.conf".source = "${pkgs.rygel}/etc/rygel.conf";
};
}

4
nixos/modules/services/desktops/gnome/sushi.nix
View File

@ -31,9 +31,9 @@
config = lib.mkIf config.services.gnome.sushi.enable {
environment.systemPackages = [ pkgs.gnome.sushi ];
environment.systemPackages = [ pkgs.sushi ];
services.dbus.packages = [ pkgs.gnome.sushi ];
services.dbus.packages = [ pkgs.sushi ];
};

6
nixos/modules/services/x11/desktop-managers/budgie.nix
View File

@ -61,7 +61,7 @@ in {
'';
type = types.listOf types.package;
default = [];
example = literalExpression "[ pkgs.gnome.gpaste ]";
example = literalExpression "[ pkgs.gpaste ]";
};
extraGSettingsOverrides = mkOption {
@ -132,7 +132,7 @@ in {
gnome-menus
# Required by Budgie Control Center.
gnome.zenity
zenity
# Provides `gsettings`.
glib
@ -162,7 +162,7 @@ in {
++ cfg.sessionPath;
# Both budgie-desktop-view and nemo defaults to this emulator.
programs.gnome-terminal.enable = mkDefault (notExcluded pkgs.gnome.gnome-terminal);
programs.gnome-terminal.enable = mkDefault (notExcluded pkgs.gnome-terminal);
# Fonts.
fonts.packages = [

14
nixos/modules/services/x11/desktop-managers/cinnamon.nix
View File

@ -27,7 +27,7 @@ in
sessionPath = mkOption {
default = [];
type = types.listOf types.package;
example = literalExpression "[ pkgs.gnome.gpaste ]";
example = literalExpression "[ pkgs.gpaste ]";
description = ''
Additional list of packages to be added to the session search path.
Useful for GSettings-conditional autostart.
@ -163,8 +163,8 @@ in
libgnomekbd
# theme
gnome.adwaita-icon-theme
gnome.gnome-themes-extra
adwaita-icon-theme
gnome-themes-extra
gtk3.out
# other
@ -229,11 +229,11 @@ in
})
(mkIf serviceCfg.apps.enable {
programs.gnome-disks.enable = mkDefault (notExcluded pkgs.gnome.gnome-disk-utility);
programs.gnome-terminal.enable = mkDefault (notExcluded pkgs.gnome.gnome-terminal);
programs.file-roller.enable = mkDefault (notExcluded pkgs.gnome.file-roller);
programs.gnome-disks.enable = mkDefault (notExcluded pkgs.gnome-disk-utility);
programs.gnome-terminal.enable = mkDefault (notExcluded pkgs.gnome-terminal);
programs.file-roller.enable = mkDefault (notExcluded pkgs.file-roller);
environment.systemPackages = with pkgs // pkgs.gnome // pkgs.cinnamon; utils.removePackagesByName [
environment.systemPackages = with pkgs // pkgs.cinnamon; utils.removePackagesByName [
# cinnamon team apps
bulky
warpinator

2
nixos/modules/services/x11/desktop-managers/gnome.md
View File

@ -114,7 +114,7 @@ in `dconf-editor`
## Shell Extensions {#sec-gnome-shell-extensions}
Most Shell extensions are packaged under the `gnomeExtensions` attribute.
Some packages that include Shell extensions, like `gnome.gpaste`, don’t have their extension decoupled under this attribute.
Some packages that include Shell extensions, like `gpaste`, don’t have their extension decoupled under this attribute.
You can install them like any other package:

44
nixos/modules/services/x11/desktop-managers/gnome.nix
View File

@ -89,7 +89,7 @@ in
sessionPath = mkOption {
default = [];
type = types.listOf types.package;
example = literalExpression "[ pkgs.gnome.gpaste ]";
example = literalExpression "[ pkgs.gpaste ]";
description = ''
Additional list of packages to be added to the session search path.
Useful for GNOME Shell extensions or GSettings-conditional autostart.
@ -176,7 +176,7 @@ in
environment.gnome.excludePackages = mkOption {
default = [];
example = literalExpression "[ pkgs.gnome.totem ]";
example = literalExpression "[ pkgs.totem ]";
type = types.listOf types.package;
description = "Which packages gnome should exclude from the default environment";
};
@ -373,7 +373,7 @@ in
gnome-shell
];
optionalPackages = with pkgs.gnome; [
adwaita-icon-theme
pkgs.adwaita-icon-theme
nixos-background-info
gnome-backgrounds
gnome-bluetooth
@ -399,28 +399,28 @@ in
with pkgs.gnome;
utils.removePackagesByName
([
baobab
epiphany
pkgs.baobab
pkgs.epiphany
pkgs.gnome-text-editor
gnome-calculator
gnome-calendar
pkgs.gnome-calculator
pkgs.gnome-calendar
gnome-characters
gnome-clocks
pkgs.gnome-console
gnome-contacts
gnome-font-viewer
pkgs.gnome-font-viewer
gnome-logs
gnome-maps
gnome-music
gnome-system-monitor
pkgs.gnome-system-monitor
gnome-weather
pkgs.loupe
nautilus
pkgs.nautilus
pkgs.gnome-connections
simple-scan
pkgs.simple-scan
pkgs.snapshot
totem
yelp
pkgs.totem
pkgs.yelp
] ++ lib.optionals config.services.flatpak.enable [
# Since PackageKit Nix support is not there yet,
# only install gnome-software if flatpak is enabled.
@ -432,12 +432,12 @@ in
# Since some of these have a corresponding package, we only
# enable that program module if the package hasn't been excluded
# through `environment.gnome.excludePackages`
programs.evince.enable = notExcluded pkgs.gnome.evince;
programs.file-roller.enable = notExcluded pkgs.gnome.file-roller;
programs.geary.enable = notExcluded pkgs.gnome.geary;
programs.gnome-disks.enable = notExcluded pkgs.gnome.gnome-disk-utility;
programs.seahorse.enable = notExcluded pkgs.gnome.seahorse;
services.gnome.sushi.enable = notExcluded pkgs.gnome.sushi;
programs.evince.enable = notExcluded pkgs.evince;
programs.file-roller.enable = notExcluded pkgs.file-roller;
programs.geary.enable = notExcluded pkgs.geary;
programs.gnome-disks.enable = notExcluded pkgs.gnome-disk-utility;
programs.seahorse.enable = notExcluded pkgs.seahorse;
services.gnome.sushi.enable = notExcluded pkgs.sushi;
# VTE shell integration for gnome-console
programs.bash.vteIntegration = mkDefault true;
@ -482,9 +482,9 @@ in
# Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/-/blob/3.38.0/elements/core/meta-gnome-core-developer-tools.bst
(lib.mkIf serviceCfg.core-developer-tools.enable {
environment.systemPackages = with pkgs.gnome; utils.removePackagesByName [
dconf-editor
devhelp
environment.systemPackages = utils.removePackagesByName [
pkgs.dconf-editor
pkgs.devhelp
pkgs.gnome-builder
# boxes would make sense in this option, however
# it doesn't function well enough to be included

10
nixos/modules/services/x11/desktop-managers/pantheon.nix
View File

@ -44,7 +44,7 @@ in
sessionPath = mkOption {
default = [];
type = types.listOf types.package;
example = literalExpression "[ pkgs.gnome.gpaste ]";
example = literalExpression "[ pkgs.gpaste ]";
description = ''
Additional list of packages to be added to the session search path.
Useful for GSettings-conditional autostart.
@ -207,7 +207,7 @@ in
desktop-file-utils
glib # for gsettings program
gnome-menus
gnome.adwaita-icon-theme
adwaita-icon-theme
gtk3.out # for gtk-launch program
onboard
orca # elementary/greeter#668
@ -284,11 +284,11 @@ in
})
(mkIf serviceCfg.apps.enable {
programs.evince.enable = mkDefault (notExcluded pkgs.gnome.evince);
programs.file-roller.enable = mkDefault (notExcluded pkgs.gnome.file-roller);
programs.evince.enable = mkDefault (notExcluded pkgs.evince);
programs.file-roller.enable = mkDefault (notExcluded pkgs.file-roller);
environment.systemPackages = utils.removePackagesByName ([
pkgs.gnome.gnome-font-viewer
pkgs.gnome-font-viewer
] ++ (with pkgs.pantheon; [
elementary-calculator
elementary-calendar

4
nixos/modules/services/x11/desktop-managers/xfce.nix
View File

@ -84,8 +84,8 @@ in
glib # for gsettings
gtk3.out # gtk-update-icon-cache
gnome.gnome-themes-extra
gnome.adwaita-icon-theme
gnome-themes-extra
adwaita-icon-theme
hicolor-icon-theme
tango-icon-theme
xfce4-icon-theme

4
nixos/modules/services/x11/display-managers/gdm.nix
View File

@ -155,7 +155,7 @@ in
gdm # for gnome-login.session
config.services.displayManager.sessionData.desktops
pkgs.gnome.gnome-control-center # for accessibility icon
pkgs.gnome.adwaita-icon-theme
pkgs.adwaita-icon-theme
pkgs.hicolor-icon-theme # empty icon theme as a base
];
} // optionalAttrs (xSessionWrapper != null) {
@ -183,7 +183,7 @@ in
# Otherwise GDM will not be able to start correctly and display Wayland sessions
systemd.packages = with pkgs.gnome; [ gdm gnome-session gnome-shell ];
environment.systemPackages = [ pkgs.gnome.adwaita-icon-theme ];
environment.systemPackages = [ pkgs.adwaita-icon-theme ];
# We dont use the upstream gdm service
# it has to be disabled since the gdm package has it

4
nixos/modules/services/x11/display-managers/lightdm-greeters/enso-os.nix
View File

@ -34,8 +34,8 @@ in {
theme = {
package = mkOption {
type = types.package;
default = pkgs.gnome.gnome-themes-extra;
defaultText = literalExpression "pkgs.gnome.gnome-themes-extra";
default = pkgs.gnome-themes-extra;
defaultText = literalExpression "pkgs.gnome-themes-extra";
description = ''
The package path that contains the theme given in the name option.
'';

12
nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix
View File

@ -47,8 +47,8 @@ in
package = mkOption {
type = types.package;
default = pkgs.gnome.gnome-themes-extra;
defaultText = literalExpression "pkgs.gnome.gnome-themes-extra";
default = pkgs.gnome-themes-extra;
defaultText = literalExpression "pkgs.gnome-themes-extra";
description = ''
The package path that contains the theme given in the name option.
'';
@ -68,8 +68,8 @@ in
package = mkOption {
type = types.package;
default = pkgs.gnome.adwaita-icon-theme;
defaultText = literalExpression "pkgs.gnome.adwaita-icon-theme";
default = pkgs.adwaita-icon-theme;
defaultText = literalExpression "pkgs.adwaita-icon-theme";
description = ''
The package path that contains the icon theme given in the name option.
'';
@ -89,8 +89,8 @@ in
package = mkOption {
type = types.package;
default = pkgs.gnome.adwaita-icon-theme;
defaultText = literalExpression "pkgs.gnome.adwaita-icon-theme";
default = pkgs.adwaita-icon-theme;
defaultText = literalExpression "pkgs.adwaita-icon-theme";
description = ''
The package path that contains the cursor theme given in the name option.
'';

12
nixos/modules/services/x11/display-managers/lightdm-greeters/slick.nix
View File

@ -33,8 +33,8 @@ in
theme = {
package = mkOption {
type = types.package;
default = pkgs.gnome.gnome-themes-extra;
defaultText = literalExpression "pkgs.gnome.gnome-themes-extra";
default = pkgs.gnome-themes-extra;
defaultText = literalExpression "pkgs.gnome-themes-extra";
description = ''
The package path that contains the theme given in the name option.
'';
@ -52,8 +52,8 @@ in
iconTheme = {
package = mkOption {
type = types.package;
default = pkgs.gnome.adwaita-icon-theme;
defaultText = literalExpression "pkgs.gnome.adwaita-icon-theme";
default = pkgs.adwaita-icon-theme;
defaultText = literalExpression "pkgs.adwaita-icon-theme";
description = ''
The package path that contains the icon theme given in the name option.
'';
@ -90,8 +90,8 @@ in
cursorTheme = {
package = mkOption {
type = types.package;
default = pkgs.gnome.adwaita-icon-theme;
defaultText = literalExpression "pkgs.gnome.adwaita-icon-theme";
default = pkgs.adwaita-icon-theme;
defaultText = literalExpression "pkgs.adwaita-icon-theme";
description = ''
The package path that contains the cursor theme given in the name option.
'';

2
nixos/tests/cinnamon-wayland.nix
View File

@ -14,7 +14,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
};
# For the sessionPath subtest.
services.xserver.desktopManager.cinnamon.sessionPath = [ pkgs.gnome.gpaste ];
services.xserver.desktopManager.cinnamon.sessionPath = [ pkgs.gpaste ];
};
enableOCR = true;

2
nixos/tests/cinnamon.nix
View File

@ -13,7 +13,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
environment.cinnamon.excludePackages = [ pkgs.gnome-text-editor ];
# For the sessionPath subtest.
services.xserver.desktopManager.cinnamon.sessionPath = [ pkgs.gnome.gpaste ];
services.xserver.desktopManager.cinnamon.sessionPath = [ pkgs.gpaste ];
};
enableOCR = true;

2
nixos/tests/plotinus.nix
View File

@ -9,7 +9,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
{ imports = [ ./common/x11.nix ];
programs.plotinus.enable = true;
environment.systemPackages = [ pkgs.gnome.gnome-calculator pkgs.xdotool ];
environment.systemPackages = [ pkgs.gnome-calculator pkgs.xdotool ];
};
testScript = ''

2
nixos/tests/terminal-emulators.nix
View File

@ -42,7 +42,7 @@ let tests = {
germinal.pkg = p: p.germinal;
gnome-terminal.pkg = p: p.gnome.gnome-terminal;
gnome-terminal.pkg = p: p.gnome-terminal;
guake.pkg = p: p.guake;
guake.cmd = "SHELL=$command guake --show";

2
nixos/tests/ydotool.nix
View File

@ -9,7 +9,7 @@ let
textInput = "This works.";
inputBoxText = "Enter input";
inputBox = pkgs.writeShellScript "zenity-input" ''
${lib.getExe pkgs.gnome.zenity} --entry --text '${inputBoxText}:' > /tmp/output &
${lib.getExe pkgs.zenity} --entry --text '${inputBoxText}:' > /tmp/output &
'';
asUser = ''
def as_user(cmd: str):

6
pkgs/applications/audio/bespokesynth/default.nix
View File

@ -29,7 +29,7 @@
, curl
, pcre
, mount
, gnome
, zenity
, Accelerate
, Cocoa
, WebKit
@ -91,7 +91,7 @@ stdenv.mkDerivation rec {
libusb1
alsa-lib
libjack2
gnome.zenity
zenity
alsa-tools
libxcb
xcbutil
@ -129,7 +129,7 @@ stdenv.mkDerivation rec {
# These X11 libs get dlopen'd, they cause visual bugs when unavailable.
wrapProgram $out/bin/BespokeSynth \
--prefix PATH : '${lib.makeBinPath [
gnome.zenity
zenity
(python3.withPackages (ps: with ps; [ jedi ]))
]}'
'';

3
pkgs/applications/audio/easytag/default.nix
View File

@ -17,6 +17,7 @@
libxml2,
gsettings-desktop-schemas,
gnome,
adwaita-icon-theme,
wrapGAppsHook3,
fetchpatch,
}:
@ -59,7 +60,7 @@ stdenv.mkDerivation rec {
opusfile
flac
gsettings-desktop-schemas
gnome.adwaita-icon-theme
adwaita-icon-theme
];
doCheck = false; # fails 1 out of 9 tests

4
pkgs/applications/audio/exaile/default.nix
View File

@ -1,8 +1,8 @@
{ stdenv, lib, fetchFromGitHub
, gobject-introspection, makeWrapper, wrapGAppsHook3
, gtk3, gst_all_1, python3
, gettext, gnome, help2man, keybinder3, libnotify, librsvg, streamripper, udisks, webkitgtk
, iconTheme ? gnome.adwaita-icon-theme
, gettext, adwaita-icon-theme, help2man, keybinder3, libnotify, librsvg, streamripper, udisks, webkitgtk
, iconTheme ? adwaita-icon-theme
, deviceDetectionSupport ? true
, documentationSupport ? true
, notificationSupport ? true

4
pkgs/applications/audio/gpodder/default.nix
View File

@ -2,7 +2,7 @@
, fetchFromGitHub
, gitUpdater
, glibcLocales
, gnome
, adwaita-icon-theme
, gobject-introspection
, gtk3
, intltool
@ -42,7 +42,7 @@ python3Packages.buildPythonApplication rec {
buildInputs = [
python3
gtk3
gnome.adwaita-icon-theme
adwaita-icon-theme
];
nativeCheckInputs = with python3Packages; [

4
pkgs/applications/audio/guitarix/default.nix
View File

@ -12,7 +12,7 @@
, glib
, glib-networking
, glibmm
, gnome
, adwaita-icon-theme
, gsettings-desktop-schemas
, gtk3
, gtkmm3
@ -76,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: {
glib
glib-networking.out
glibmm
gnome.adwaita-icon-theme
adwaita-icon-theme
gsettings-desktop-schemas
gtk3
gtkmm3

6
pkgs/applications/audio/helio-workstation/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub
, alsa-lib, freetype, xorg, curl, libGL, libjack2, gnome
, alsa-lib, freetype, xorg, curl, libGL, libjack2, zenity
, pkg-config, makeWrapper
}:
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
buildInputs = [
alsa-lib freetype xorg.libX11 xorg.libXext xorg.libXinerama xorg.libXrandr
xorg.libXcursor xorg.libXcomposite curl libGL libjack2 gnome.zenity
xorg.libXcursor xorg.libXcomposite curl libGL libjack2 zenity
];
nativeBuildInputs = [ pkg-config makeWrapper ];
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
installPhase = ''
mkdir -p $out/bin
install -Dm755 build/helio $out/bin
wrapProgram $out/bin/helio --prefix PATH ":" ${gnome.zenity}/bin
wrapProgram $out/bin/helio --prefix PATH ":" ${zenity}/bin
mkdir -p $out/share
cp -r ../Deployment/Linux/Debian/x64/usr/share/* $out/share

4
pkgs/applications/audio/pavucontrol/default.nix
View File

@ -8,7 +8,7 @@
, libsigcxx
, libcanberra-gtk3
, json-glib
, gnome
, adwaita-icon-theme
, wrapGAppsHook3
}:
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
libsigcxx
libcanberra-gtk3
json-glib
gnome.adwaita-icon-theme
adwaita-icon-theme
];
nativeBuildInputs = [ pkg-config intltool wrapGAppsHook3 ];

4
pkgs/applications/audio/pithos/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, lib, fetchFromGitHub, meson, ninja, pkg-config, appstream-glib
, wrapGAppsHook3, pythonPackages, gtk3, gnome, gobject-introspection
, wrapGAppsHook3, pythonPackages, gtk3, adwaita-icon-theme, gobject-introspection
, libnotify, libsecret, gst_all_1 }:
pythonPackages.buildPythonApplication rec {
@ -27,7 +27,7 @@ pythonPackages.buildPythonApplication rec {
];
propagatedBuildInputs =
[ gtk3 gobject-introspection libnotify libsecret gnome.adwaita-icon-theme ] ++
[ gtk3 gobject-introspection libnotify libsecret adwaita-icon-theme ] ++
(with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad ]) ++
(with pythonPackages; [ pygobject3 pylast ]);

4
pkgs/applications/audio/plugdata/default.nix
View File

@ -9,7 +9,7 @@
, alsa-lib
, freetype
, webkitgtk
, gnome
, zenity
, curl
, xorg
, python3
@ -102,7 +102,7 @@ stdenv.mkDerivation (finalAttrs: {
# These X11 libs get dlopen'd, they cause visual bugs when unavailable.
wrapProgram $out/bin/plugdata \
--prefix PATH : '${lib.makeBinPath [
gnome.zenity
zenity
]}' \
--prefix LD_LIBRARY_PATH : '${lib.makeLibraryPath [
xorg.libXrandr

8
pkgs/applications/audio/sfizz/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, libjack2, libsndfile, xorg, freetype
, libxkbcommon, cairo, glib, gnome, flac, libogg, libvorbis, libopus, cmake
, libxkbcommon, cairo, glib, zenity, flac, libogg, libvorbis, libopus, cmake
, pango, pkg-config, catch2
}:
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
libxkbcommon
cairo
glib
gnome.zenity
zenity
freetype
pango
];
@ -47,9 +47,9 @@ stdenv.mkDerivation rec {
cp ${catch2}/include/catch2/catch.hpp tests/catch2/catch.hpp
substituteInPlace plugins/editor/external/vstgui4/vstgui/lib/platform/linux/x11fileselector.cpp \
--replace 'zenitypath = "zenity"' 'zenitypath = "${gnome.zenity}/bin/zenity"'
--replace 'zenitypath = "zenity"' 'zenitypath = "${zenity}/bin/zenity"'
substituteInPlace plugins/editor/src/editor/NativeHelpers.cpp \
--replace '/usr/bin/zenity' '${gnome.zenity}/bin/zenity'
--replace '/usr/bin/zenity' '${zenity}/bin/zenity'
'';
cmakeFlags = [ "-DSFIZZ_TESTS=ON" ];

4
pkgs/applications/audio/sonata/default.nix
View File

@ -1,5 +1,5 @@
{ lib, fetchFromGitHub, wrapGAppsHook3, gettext
, python3Packages, gnome, gtk3, glib, gdk-pixbuf, gsettings-desktop-schemas, gobject-introspection }:
, python3Packages, adwaita-icon-theme, gtk3, glib, gdk-pixbuf, gsettings-desktop-schemas, gobject-introspection }:
let
inherit (python3Packages) buildPythonApplication isPy3k dbus-python pygobject3 mpd2 setuptools;
@ -24,7 +24,7 @@ in buildPythonApplication rec {
buildInputs = [
glib
gnome.adwaita-icon-theme
adwaita-icon-theme
gsettings-desktop-schemas
gtk3
gdk-pixbuf

3
pkgs/applications/audio/sound-juicer/default.nix
View File

@ -11,6 +11,7 @@
, brasero
, libcanberra-gtk3
, gnome
, adwaita-icon-theme
, gst_all_1
, libmusicbrainz5
, libdiscid
@ -42,7 +43,7 @@ stdenv.mkDerivation rec {
gtk3
brasero
libcanberra-gtk3
gnome.adwaita-icon-theme
adwaita-icon-theme
gsettings-desktop-schemas
libmusicbrainz5
libdiscid

4
pkgs/applications/audio/spotify/linux.nix
View File

@ -1,6 +1,6 @@
{ fetchurl, lib, stdenv, squashfsTools, xorg, alsa-lib, makeShellWrapper, wrapGAppsHook3, openssl, freetype
, glib, pango, cairo, atk, gdk-pixbuf, gtk3, cups, nspr, nss_latest, libpng, libnotify
, libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg_4, curlWithGnuTls, zlib, gnome
, libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg_4, curlWithGnuTls, zlib, zenity
, at-spi2-atk, at-spi2-core, libpulseaudio, libdrm, mesa, libxkbcommon
, pname, meta, harfbuzz, libayatana-appindicator, libdbusmenu, libGL
# High-DPI support: Spotify's --force-device-scale-factor argument
@ -179,7 +179,7 @@ stdenv.mkDerivation {
--add-flags "--force-device-scale-factor=${toString deviceScaleFactor}" \
''} \
--prefix LD_LIBRARY_PATH : "$librarypath" \
--prefix PATH : "${gnome.zenity}/bin" \
--prefix PATH : "${zenity}/bin" \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}"
runHook postFixup

4
pkgs/applications/audio/touchosc/default.nix
View File

@ -18,7 +18,7 @@
, libXrender
, libXxf86vm
, libglvnd
, gnome
, zenity
}:
let
@ -39,7 +39,7 @@ let
];
runBinDeps = [
gnome.zenity
zenity
];
in

6
pkgs/applications/audio/vcv-rack/default.nix
View File

@ -7,7 +7,7 @@
, ghc_filesystem
, glew
, glfw
, gnome
, zenity
, gtk3-x11
, imagemagick
, jansson
@ -173,7 +173,7 @@ stdenv.mkDerivation rec {
# Fix reference to zenity
substituteInPlace dep/osdialog/osdialog_zenity.c \
--replace 'zenityBin[] = "zenity"' 'zenityBin[] = "${gnome.zenity}/bin/zenity"'
--replace 'zenityBin[] = "zenity"' 'zenityBin[] = "${zenity}/bin/zenity"'
'';
nativeBuildInputs = [
@ -191,7 +191,7 @@ stdenv.mkDerivation rec {
ghc_filesystem
glew
glfw
gnome.zenity
zenity
gtk3-x11
jansson
libarchive

4
pkgs/applications/backup/ludusavi/default.nix
View File

@ -17,7 +17,7 @@
, libxkbcommon
, vulkan-loader
, wayland
, gnome
, zenity
, libsForQt5
}:
@ -85,7 +85,7 @@ rustPlatform.buildRustPackage rec {
in
''
patchelf --set-rpath "${libPath}" "$out/bin/ludusavi"
wrapProgram $out/bin/ludusavi --prefix PATH : ${lib.makeBinPath [ gnome.zenity libsForQt5.kdialog ]}
wrapProgram $out/bin/ludusavi --prefix PATH : ${lib.makeBinPath [ zenity libsForQt5.kdialog ]}
'';

4
pkgs/applications/display-managers/lightdm/default.nix
View File

@ -21,13 +21,13 @@
, polkit
, accountsservice
, gtk-doc
, gnome
, gobject-introspection
, vala
, fetchpatch
, withQt5 ? false
, qtbase
, yelp-tools
, yelp-xsl
}:
stdenv.mkDerivation rec {
@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
autoconf
automake
yelp-tools
gnome.yelp-xsl
yelp-xsl
gobject-introspection
gtk-doc
intltool

4
pkgs/applications/editors/bluefish/default.nix
View File

@ -8,7 +8,7 @@
, enchant
, gucharmap
, python3
, gnome
, adwaita-icon-theme
}:
stdenv.mkDerivation rec {
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config wrapGAppsHook3 ];
buildInputs = [
gnome.adwaita-icon-theme
adwaita-icon-theme
gtk
libxml2
enchant

3
pkgs/applications/editors/gnome-latex/default.nix
View File

@ -12,6 +12,7 @@
, libgedit-gtksourceview
, libgedit-tepl
, libgee
, adwaita-icon-theme
, gnome
, glib
, pkg-config
@ -49,7 +50,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
gnome.adwaita-icon-theme
adwaita-icon-theme
glib
gsettings-desktop-schemas
gspell

4
pkgs/applications/editors/vim/plugins/overrides.nix
View File

@ -25,7 +25,6 @@
, fzf
, gawk
, git
, gnome
, himalaya
, htop
, jq
@ -58,6 +57,7 @@
, xorg
, xxd
, zathura
, zenity
, zsh
, # codeium-nvim dependencies
codeium
@ -1614,7 +1614,7 @@
vCoolor-vim = super.vCoolor-vim.overrideAttrs {
# on linux can use either Zenity or Yad.
propagatedBuildInputs = [ gnome.zenity ];
propagatedBuildInputs = [ zenity ];
meta = {
description = "Simple color selector/picker plugin";
license = lib.licenses.publicDomain;

4
pkgs/applications/emulators/cdemu/analyzer.nix
View File

@ -1,5 +1,5 @@
{ cmake, pkg-config, callPackage, gobject-introspection, wrapGAppsHook3
, python3Packages, libxml2, gnuplot, gnome, gdk-pixbuf, intltool, libmirage }:
, python3Packages, libxml2, gnuplot, adwaita-icon-theme, gdk-pixbuf, intltool, libmirage }:
python3Packages.buildPythonApplication {
inherit (callPackage ./common-drv-attrs.nix {
@ -8,7 +8,7 @@ python3Packages.buildPythonApplication {
hash = "sha256-7I8RUgd+k3cEzskJGbziv1f0/eo5QQXn62wGh/Y5ozc=";
}) pname version src meta;
buildInputs = [ libxml2 gnuplot libmirage gnome.adwaita-icon-theme gdk-pixbuf ];
buildInputs = [ libxml2 gnuplot libmirage adwaita-icon-theme gdk-pixbuf ];
propagatedBuildInputs = with python3Packages; [ pygobject3 matplotlib ];
nativeBuildInputs = [ cmake pkg-config wrapGAppsHook3 intltool gobject-introspection ];

4
pkgs/applications/emulators/cdemu/gui.nix
View File

@ -1,5 +1,5 @@
{ callPackage, cmake, pkg-config, wrapGAppsHook3, gobject-introspection
, python3Packages, libnotify, intltool, gnome, gdk-pixbuf }:
, python3Packages, libnotify, intltool, adwaita-icon-theme, gdk-pixbuf }:
python3Packages.buildPythonApplication {
inherit (callPackage ./common-drv-attrs.nix {
@ -9,7 +9,7 @@ python3Packages.buildPythonApplication {
}) pname version src meta;
nativeBuildInputs = [ cmake pkg-config wrapGAppsHook3 intltool gobject-introspection ];
buildInputs = [ libnotify gnome.adwaita-icon-theme gdk-pixbuf ];
buildInputs = [ libnotify adwaita-icon-theme gdk-pixbuf ];
propagatedBuildInputs = with python3Packages; [ pygobject3 ];
pyproject = false;

4
pkgs/applications/file-managers/pcmanfm/default.nix
View File

@ -8,7 +8,7 @@
, pango
, pkg-config
, wrapGAppsHook3
, gnome
, adwaita-icon-theme
, withGtk3 ? true
, gtk2
, gtk3
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
sha256 = "sha256-FMt7JHSTxMzmX7tZAmEeOtAKeocPvB5QrcUEKMUUDPc=";
};
buildInputs = [ glib gtk libfm' libX11 pango gnome.adwaita-icon-theme ];
buildInputs = [ glib gtk libfm' libX11 pango adwaita-icon-theme ];
nativeBuildInputs = [ pkg-config wrapGAppsHook3 intltool ];
configureFlags = optional withGtk3 "--with-gtk=3";

4
pkgs/applications/graphics/avocode/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, makeDesktopItem, fetchurl, unzip
, gdk-pixbuf, glib, gtk3, atk, at-spi2-atk, pango, cairo, freetype, fontconfig, dbus, nss, nspr, alsa-lib, cups, expat, udev, gnome
, gdk-pixbuf, glib, gtk3, atk, at-spi2-atk, pango, cairo, freetype, fontconfig, dbus, nss, nspr, alsa-lib, cups, expat, udev, adwaita-icon-theme
, xorg, mozjpeg, makeWrapper, wrapGAppsHook3, libuuid, at-spi2-core, libdrm, mesa, libxkbcommon
}:
@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [makeWrapper wrapGAppsHook3 unzip];
buildInputs = [ gtk3 gnome.adwaita-icon-theme ];
buildInputs = [ gtk3 adwaita-icon-theme ];
# src is producing multiple folder on unzip so we must
# override unpackCmd to extract it into newly created folder

4
pkgs/applications/graphics/darktable/default.nix
View File

@ -38,7 +38,7 @@
, colord-gtk
, libwebp
, libsecret
, gnome
, adwaita-icon-theme
, SDL2
, ocl-icd
, pcre
@ -94,7 +94,7 @@ stdenv.mkDerivation rec {
libwebp
libsecret
SDL2
gnome.adwaita-icon-theme
adwaita-icon-theme
osm-gps-map
pcre
isocodes

10
pkgs/applications/graphics/geeqie/default.nix
View File

@ -2,7 +2,7 @@
, gtk3, lcms2, exiv2, libchamplain, clutter-gtk, ffmpegthumbnailer, fbida
, libarchive, djvulibre, libheif, openjpeg, libjxl, libraw, lua5_3, poppler
, gspell, libtiff, libwebp
, gphoto2, imagemagick, yad, exiftool, gnome, libnotify
, gphoto2, imagemagick, yad, exiftool, zenity, libnotify
, wrapGAppsHook3, fetchpatch, doxygen
, nix-update-script
}:
@ -56,18 +56,18 @@ stdenv.mkDerivation rec {
# Allow to crop image.
# Requires imagemagick, exiv2 and exiftool.
sed -i $out/lib/geeqie/geeqie-image-crop \
-e '1 a export PATH=${lib.makeBinPath [ imagemagick exiv2 exiftool gnome.zenity ]}:$PATH'
-e '1 a export PATH=${lib.makeBinPath [ imagemagick exiv2 exiftool zenity ]}:$PATH'
# Requires gphoto2 and libnotify
sed -i $out/lib/geeqie/geeqie-tethered-photography \
-e '1 a export PATH=${lib.makeBinPath [ gphoto2 gnome.zenity libnotify ]}:$PATH'
-e '1 a export PATH=${lib.makeBinPath [ gphoto2 zenity libnotify ]}:$PATH'
# Import images from camera.
# Requires gphoto2.
sed -i $out/lib/geeqie/geeqie-camera-import \
-e '1 a export PATH=${lib.makeBinPath [ gphoto2 gnome.zenity ]}:$PATH'
-e '1 a export PATH=${lib.makeBinPath [ gphoto2 zenity ]}:$PATH'
# Export jpeg from raw file.
# Requires exiv2, exiftool and lcms2.
sed -i $out/lib/geeqie/geeqie-export-jpeg \
-e '1 a export PATH=${lib.makeBinPath [ gnome.zenity exiv2 exiftool lcms2 ]}:$PATH'
-e '1 a export PATH=${lib.makeBinPath [ zenity exiv2 exiftool lcms2 ]}:$PATH'
'';
enableParallelBuilding = true;

4
pkgs/applications/graphics/gimp/wrapper.nix
View File

@ -1,4 +1,4 @@
{ lib, symlinkJoin, makeWrapper, gimpPlugins, gnome, plugins ? null}:
{ lib, symlinkJoin, makeWrapper, gimpPlugins, gnome-themes-extra, plugins ? null}:
let
inherit (gimpPlugins) gimp;
@ -19,7 +19,7 @@ in symlinkJoin {
wrapProgram $out/bin/$each \
--set GIMP2_PLUGINDIR "$out/lib/gimp/2.0" \
--set GIMP2_DATADIR "$out/share/gimp/2.0" \
--prefix GTK_PATH : "${gnome.gnome-themes-extra}/lib/gtk-2.0" \
--prefix GTK_PATH : "${gnome-themes-extra}/lib/gtk-2.0" \
${toString extraArgs}
done
set +x

4
pkgs/applications/graphics/glabels/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, fetchpatch, barcode, gnome, autoreconfHook
{ lib, stdenv, fetchurl, fetchpatch, barcode, gnome, gnome-common, autoreconfHook
, gtk3, gtk-doc, libxml2, librsvg , libtool, libe-book, gsettings-desktop-schemas
, intltool, itstool, makeWrapper, pkg-config, yelp-tools, qrencode
}:
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper intltool ];
buildInputs = [
barcode gtk3 gtk-doc yelp-tools
gnome.gnome-common gsettings-desktop-schemas
gnome-common gsettings-desktop-schemas
itstool libxml2 librsvg libe-book libtool qrencode
];

3
pkgs/applications/graphics/gthumb/default.nix
View File

@ -5,6 +5,7 @@
, pkg-config
, meson
, ninja
, adwaita-icon-theme
, exiv2
, libheif
, libjpeg
@ -58,7 +59,7 @@ stdenv.mkDerivation rec {
clutter-gtk
exiv2
glib
gnome.adwaita-icon-theme
adwaita-icon-theme
gsettings-desktop-schemas
gst_all_1.gst-plugins-base
(gst_all_1.gst-plugins-good.override { gtkSupport = true; })

4
pkgs/applications/graphics/kodelife/default.nix
View File

@ -19,7 +19,7 @@
, libXrender
, libXxf86vm
, libglvnd
, gnome
, zenity
}:
let
@ -39,7 +39,7 @@ let
];
runBinDeps = [
gnome.zenity
zenity
];
in

3
pkgs/applications/graphics/shotwell/default.nix
View File

@ -3,6 +3,7 @@
, fetchurl
, meson
, ninja
, adwaita-icon-theme
, gtk3
, libexif
, libgphoto2
@ -80,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: {
librsvg
librest
gcr
gnome.adwaita-icon-theme
adwaita-icon-theme
libsecret
libportal-gtk3
];

4
pkgs/applications/graphics/synfigstudio/default.nix
View File

@ -19,7 +19,7 @@
, pango
, imagemagick
, intltool
, gnome
, adwaita-icon-theme
, harfbuzz
, freetype
, fribidi
@ -131,7 +131,7 @@ stdenv.mkDerivation {
libsigcxx
libxmlxx
mlt
gnome.adwaita-icon-theme
adwaita-icon-theme
openexr
fftw
];

4
pkgs/applications/graphics/tev/default.nix
View File

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub
, cmake, wrapGAppsHook3
, libX11, libzip, glfw, libpng, xorg, gnome
, libX11, libzip, glfw, libpng, xorg, zenity
}:
stdenv.mkDerivation rec {
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
postInstall = ''
wrapProgram $out/bin/tev \
"''${gappsWrapperArgs[@]}" \
--prefix PATH ":" "${gnome.zenity}/bin"
--prefix PATH ":" "${zenity}/bin"
'';
env.CXXFLAGS = "-include cstdint";

4
pkgs/applications/misc/collision/default.nix
View File

@ -5,7 +5,7 @@
, wrapGAppsHook4
, desktopToDarwinBundle
, gobject-introspection
, gnome
, nautilus-python
, python3
, libadwaita
, openssl
@ -54,7 +54,7 @@ crystal.buildCrystalPackage rec {
libadwaita
openssl
libxml2
gnome.nautilus-python
nautilus-python
python3.pkgs.pygobject3
];

4
pkgs/applications/misc/gpx-viewer/default.nix
View File

@ -7,7 +7,7 @@
, ninja
, vala
, pkg-config
, gnome
, adwaita-icon-theme
, libchamplain
, gdl
, wrapGAppsHook3
@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
buildInputs = [
gdl
libchamplain
gnome.adwaita-icon-theme
adwaita-icon-theme
libxml2
];

4
pkgs/applications/misc/inochi2d/generic.nix
View File

@ -13,7 +13,7 @@
dbus,
freetype,
SDL2,
gnome,
zenity,
builderArgs,
}:
@ -126,7 +126,7 @@ buildDubPackage (
postFixup = ''
# Add support for `open file` dialog
makeWrapper $out/share/${pname}/${pname} $out/bin/${pname} \
--prefix PATH : ${lib.makeBinPath [ gnome.zenity ]}
--prefix PATH : ${lib.makeBinPath [ zenity ]}
'';
meta = {

4
pkgs/applications/misc/keeweb/default.nix
View File

@ -13,7 +13,7 @@
, nss
, udev
, xorg
, gnome
, gnome-keyring
, mesa
, gtk3
, libusb1
@ -54,7 +54,7 @@ let
xorg.libXScrnSaver
xorg.libXtst
xorg.libxshmfence
gnome.gnome-keyring
gnome-keyring
mesa
gtk3
libusb1

2
pkgs/applications/misc/lutris/fhsenv.nix
View File

@ -7,7 +7,7 @@
let
qt5Deps = pkgs: with pkgs.qt5; [ qtbase qtmultimedia ];
gnomeDeps = pkgs: with pkgs; [ gnome.zenity gtksourceview gnome-desktop libgnome-keyring webkitgtk ];
gnomeDeps = pkgs: with pkgs; [ zenity gtksourceview gnome-desktop libgnome-keyring webkitgtk ];
xorgDeps = pkgs: with pkgs.xorg; [
libX11 libXrender libXrandr libxcb libXmu libpthreadstubs libXext libXdmcp
libXxf86vm libXinerama libSM libXv libXaw libXi libXcursor libXcomposite

4
pkgs/applications/misc/notify-osd-customizable/default.nix
View File

@ -2,7 +2,7 @@
, dbus-glib
, fetchurl
, glib
, gnome
, gnome-common
, libnotify
, libtool
, libwnck
@ -27,7 +27,7 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config makeWrapper libtool ];
buildInputs = [
glib libwnck libnotify dbus-glib
gsettings-desktop-schemas gnome.gnome-common
gsettings-desktop-schemas gnome-common
];
configureFlags = [ "--libexecdir=$(out)/bin" ];

3
pkgs/applications/misc/parsec/bin.nix
View File

@ -21,8 +21,7 @@
, libjpeg8
, curl
, vulkan-loader
, gnome
, zenity ? gnome.zenity
, zenity
}:
stdenvNoCC.mkDerivation {

4
pkgs/applications/misc/plank/default.nix
View File

@ -5,7 +5,7 @@
, cairo
, dconf
, glib
, gnome
, gnome-common
, gtk3
, libwnck
, libX11
@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
autoreconfHook
gettext
gnome.gnome-common
gnome-common
libxml2 # xmllint
pkg-config
vala

4
pkgs/applications/misc/pytrainer/default.nix
View File

@ -2,7 +2,7 @@
, python310
, fetchFromGitHub
, gdk-pixbuf
, gnome
, adwaita-icon-theme
, gpsbabel
, glib-networking
, glibcLocales
@ -55,7 +55,7 @@ in python.pkgs.buildPythonApplication rec {
gtk3
webkitgtk
glib-networking
gnome.adwaita-icon-theme
adwaita-icon-theme
gdk-pixbuf
];

4
pkgs/applications/misc/snapper-gui/default.nix
View File

@ -1,5 +1,5 @@
{ lib, fetchFromGitHub, python3, python3Packages
, gnome, gtk3, wrapGAppsHook3, gtksourceview3, snapper
, adwaita-icon-theme, gtk3, wrapGAppsHook3, gtksourceview3, snapper
, gobject-introspection
}:
@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec {
buildInputs = [
python3
gnome.adwaita-icon-theme
adwaita-icon-theme
];
doCheck = false; # it doesn't have any tests

4
pkgs/applications/misc/ulauncher/default.nix
View File

@ -4,7 +4,7 @@
, python3Packages
, gdk-pixbuf
, glib
, gnome
, adwaita-icon-theme
, gobject-introspection
, gtk3
, wrapGAppsHook3
@ -38,7 +38,7 @@ python3Packages.buildPythonApplication rec {
buildInputs = [
glib
gnome.adwaita-icon-theme
adwaita-icon-theme
gtk3
keybinder3
libappindicator

4
pkgs/applications/misc/yubioath-flutter/default.nix
View File

@ -6,7 +6,7 @@
, libnotify
, libappindicator
, pkg-config
, gnome
, gnome-screenshot
, makeWrapper
, removeReferencesTo
}:
@ -67,7 +67,7 @@ flutter319.buildFlutterApplication rec {
# Needed for QR scanning to work
extraWrapProgramArgs = ''
--prefix PATH : ${lib.makeBinPath [ gnome.gnome-screenshot ]}
--prefix PATH : ${lib.makeBinPath [ gnome-screenshot ]}
'';
nativeBuildInputs = [

4
pkgs/applications/networking/browsers/brave/make-brave.nix
View File

@ -12,7 +12,7 @@
, freetype
, gdk-pixbuf
, glib
, gnome
, adwaita-icon-theme
, gsettings-desktop-schemas
, gtk3
, gtk4
@ -120,7 +120,7 @@ stdenv.mkDerivation {
glib gsettings-desktop-schemas gtk3 gtk4
# needed for XDG_ICON_DIRS
gnome.adwaita-icon-theme
adwaita-icon-theme
];
unpackPhase = "dpkg-deb --fsys-tarfile $src | tar -x --no-same-permissions --no-same-owner";

4
pkgs/applications/networking/browsers/chromium/default.nix
View File

@ -1,7 +1,7 @@
{ newScope, config, stdenv, makeWrapper
, buildPackages
, ed, gnugrep, coreutils, xdg-utils
, glib, gtk3, gtk4, gnome, gsettings-desktop-schemas, gn, fetchgit
, glib, gtk3, gtk4, adwaita-icon-theme, gsettings-desktop-schemas, gn, fetchgit
, libva, pipewire, wayland
, runCommand
, lib, libkrb5
@ -101,7 +101,7 @@ in stdenv.mkDerivation {
gsettings-desktop-schemas glib gtk3 gtk4
# needed for XDG_ICON_DIRS
gnome.adwaita-icon-theme
adwaita-icon-theme
# Needed for kerberos at runtime
libkrb5

4
pkgs/applications/networking/browsers/firefox/wrapper.nix
View File

@ -4,7 +4,7 @@
## various stuff that can be plugged in
, ffmpeg, xorg, alsa-lib, libpulseaudio, libcanberra-gtk3, libglvnd, libnotify, opensc
, gnome/*.gnome-shell*/
, adwaita-icon-theme
, browserpass, gnome-browser-connector, uget-integrator, plasma5Packages, bukubrow, pipewire
, tridactyl-native
, fx-cast-bridge
@ -322,7 +322,7 @@ let
--set MOZ_LEGACY_PROFILES 1 \
--set MOZ_ALLOW_DOWNGRADE 1 \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
--suffix XDG_DATA_DIRS : '${gnome.adwaita-icon-theme}/share' \
--suffix XDG_DATA_DIRS : '${adwaita-icon-theme}/share' \
--set-default MOZ_ENABLE_WAYLAND 1 \
"''${oldWrapperArgs[@]}"
#############################

4
pkgs/applications/networking/dropbox/cli.nix
View File

@ -6,7 +6,7 @@
, python3
, dropbox
, gtk4
, gnome
, nautilus
, gdk-pixbuf
, gobject-introspection
}:
@ -51,7 +51,7 @@ stdenv.mkDerivation {
buildInputs = [
python3
gtk4
gnome.nautilus
nautilus
];
configureFlags = [

4
pkgs/applications/networking/instant-messengers/fluffychat/default.nix
View File

@ -7,7 +7,7 @@
, flutter319
, pulseaudio
, makeDesktopItem
, gnome
, zenity
, targetFlutterPlatform ? "linux"
}:
@ -50,7 +50,7 @@ flutter319.buildFlutterApplication (rec {
runtimeDependencies = [ pulseaudio ];
extraWrapProgramArgs = "--prefix PATH : ${gnome.zenity}/bin";
extraWrapProgramArgs = "--prefix PATH : ${zenity}/bin";
env.NIX_LDFLAGS = "-rpath-link ${libwebrtcRpath}";

5
pkgs/applications/networking/instant-messengers/gajim/default.nix
View File

@ -1,7 +1,7 @@
{ lib, fetchurl, gettext, wrapGAppsHook3
# Native dependencies
, python3, gtk3, gobject-introspection, gnome
, python3, gtk3, gobject-introspection, adwaita-icon-theme
, gtksourceview4
, glib-networking
@ -31,7 +31,8 @@ python3.pkgs.buildPythonApplication rec {
format = "pyproject";
buildInputs = [
gtk3 gnome.adwaita-icon-theme
gtk3
adwaita-icon-theme
gtksourceview4
glib-networking
] ++ lib.optionals enableJingle [ farstream gstreamer gst-plugins-base gst-libav gst-plugins-good libnice ]

4
pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, dpkg
, alsa-lib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, gdk-pixbuf, glib, glibc, gnome
, alsa-lib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, gdk-pixbuf, glib, glibc, gnome-keyring
, gtk3, libappindicator-gtk3, libnotify, libpulseaudio, libsecret, libv4l, nspr, nss, pango, systemd, wrapGAppsHook3, xorg
, at-spi2-atk, libuuid, at-spi2-core, libdrm, mesa, libxkbcommon, libxshmfence }:
@ -30,7 +30,7 @@ let
gtk3
libappindicator-gtk3
gnome.gnome-keyring
gnome-keyring
libnotify
libpulseaudio

4
pkgs/applications/networking/mailreaders/astroid/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, gnome, gmime3, webkitgtk, ronn
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, adwaita-icon-theme, gmime3, webkitgtk, ronn
, libsass, notmuch, boost, wrapGAppsHook3, glib-networking, protobuf
, gtkmm3, libpeas, gsettings-desktop-schemas, gobject-introspection, python3
@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
buildInputs = [
gtkmm3 gmime3 webkitgtk libsass libpeas
python3
notmuch boost gsettings-desktop-schemas gnome.adwaita-icon-theme
notmuch boost gsettings-desktop-schemas adwaita-icon-theme
glib-networking protobuf
vim
];

3
pkgs/applications/networking/mailreaders/evolution/evolution/default.nix
View File

@ -23,6 +23,7 @@
, libical
, db
, sqlite
, adwaita-icon-theme
, gnome
, gnome-desktop
, librsvg
@ -62,7 +63,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
gnome.adwaita-icon-theme
adwaita-icon-theme
bogofilter
db
evolution-data-server

4
pkgs/applications/networking/mailreaders/evolution/evolution/wrapper.nix
View File

@ -1,8 +1,8 @@
{ lib, makeWrapper, symlinkJoin, gnome, plugins }:
{ lib, makeWrapper, symlinkJoin, evolution-data-server, plugins }:
symlinkJoin {
name = "evolution-with-plugins";
paths = [ gnome.evolution-data-server ] ++ plugins;
paths = [ evolution-data-server ] ++ plugins;
nativeBuildInputs = [ makeWrapper ];

4
pkgs/applications/networking/remote/remmina/default.nix
View File

@ -9,7 +9,7 @@
, openssl, gsettings-desktop-schemas, json-glib, libsodium, webkitgtk_4_1, harfbuzz
, wayland
# The themes here are soft dependencies; only icons are missing without them.
, gnome
, adwaita-icon-theme
, withKf5Wallet ? stdenv.isLinux, libsForQt5
, withLibsecret ? stdenv.isLinux
, withVte ? true
@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
libsoup_3 spice-protocol
spice-gtk
libepoxy at-spi2-core
openssl gnome.adwaita-icon-theme json-glib libsodium
openssl adwaita-icon-theme json-glib libsodium
harfbuzz python3
wayland
] ++ lib.optionals stdenv.isLinux [ fuse3 libappindicator-gtk3 libdbusmenu-gtk3 webkitgtk_4_1 ]

4
pkgs/applications/office/autokey/default.nix
View File

@ -6,7 +6,7 @@
, gtksourceview3
, libappindicator-gtk3
, libnotify
, gnome
, zenity
, wmctrl
}:
@ -41,7 +41,7 @@ python3Packages.buildPythonApplication rec {
];
runtimeDeps = [
gnome.zenity
zenity
wmctrl
];

4
pkgs/applications/office/endeavour/default.nix
View File

@ -6,7 +6,7 @@
, pkg-config
, wrapGAppsHook4
, gettext
, gnome
, adwaita-icon-theme
, glib
, gtk4
, wayland
@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
libpeas
gnome-online-accounts
gsettings-desktop-schemas
gnome.adwaita-icon-theme
adwaita-icon-theme
# Plug-ins
evolution-data-server-gtk4 # eds

4
pkgs/applications/office/gnumeric/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, pkg-config, intltool, perlPackages
, goffice, gnome, wrapGAppsHook3, gtk3, bison, python3Packages
, goffice, gnome, adwaita-icon-theme, wrapGAppsHook3, gtk3, bison, python3Packages
, itstool
}:
@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
# ToDo: optional libgda, introspection?
buildInputs = [
goffice gtk3 gnome.adwaita-icon-theme
goffice gtk3 adwaita-icon-theme
python pygobject3
] ++ (with perlPackages; [ perl XMLParser ]);

4
pkgs/applications/office/grisbi/default.nix
View File

@ -7,7 +7,7 @@
, intltool
, wrapGAppsHook3
, libsoup
, gnome
, adwaita-icon-theme
}:
stdenv.mkDerivation rec {
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
libgsf
libofx
libsoup
gnome.adwaita-icon-theme
adwaita-icon-theme
];
meta = with lib; {

4
pkgs/applications/office/homebank/default.nix
View File

@ -1,5 +1,5 @@
{ fetchurl, lib, stdenv, gtk, pkg-config, libofx, intltool, wrapGAppsHook3
, libsoup_3, gnome }:
, libsoup_3, adwaita-icon-theme }:
stdenv.mkDerivation rec {
pname = "homebank";
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
];
nativeBuildInputs = [ pkg-config wrapGAppsHook3 intltool ];
buildInputs = [ gtk libofx libsoup_3 gnome.adwaita-icon-theme];
buildInputs = [ gtk libofx libsoup_3 adwaita-icon-theme];
meta = with lib; {
description = "Free, easy, personal accounting for everyone";

4
pkgs/applications/office/libreoffice/default.nix
View File

@ -86,7 +86,7 @@
, glm
, gst_all_1
, gdb
, gnome
, adwaita-icon-theme
, glib
, ncurses
, libepoxy
@ -311,7 +311,7 @@ in stdenv.mkDerivation (finalAttrs: {
gettext
glib
glm
gnome.adwaita-icon-theme
adwaita-icon-theme
gperf
gpgme
graphite2

6
pkgs/applications/office/paperwork/paperwork-gtk.nix
View File

@ -2,7 +2,7 @@
, python3Packages
, gtk3
, cairo
, gnome
, adwaita-icon-theme
, librsvg
, xvfb-run
, dbus
@ -69,7 +69,7 @@ python3Packages.buildPythonApplication rec {
ln -s $i $site/icon/out;
done
export XDG_DATA_DIRS=$XDG_DATA_DIRS:${gnome.adwaita-icon-theme}/share
export XDG_DATA_DIRS=$XDG_DATA_DIRS:${adwaita-icon-theme}/share
# build the user manual
PATH=$out/bin:$PATH PAPERWORK_TEST_DOCUMENTS=${sample_docs} make data
for i in src/paperwork_gtk/model/help/out/*.pdf; do
@ -89,7 +89,7 @@ python3Packages.buildPythonApplication rec {
] ++ documentation_deps;
buildInputs = [
gnome.adwaita-icon-theme
adwaita-icon-theme
libnotify
librsvg
gtk3

6
pkgs/applications/office/pdfmm/default.nix
View File

@ -3,7 +3,7 @@
, fetchFromGitHub
, ghostscript
, locale
, gnome
, zenity
, gnused
, lib
, resholve
@ -35,7 +35,7 @@ resholve.mkDerivation rec {
coreutils
ghostscript
locale
gnome.zenity
zenity
gnused
];
fake = {
@ -43,7 +43,7 @@ resholve.mkDerivation rec {
external = [ "xmessage" ];
};
execer = [
"cannot:${gnome.zenity}/bin/zenity"
"cannot:${zenity}/bin/zenity"
];
keep."$toutLu" = true;
};

4
pkgs/applications/office/tryton/default.nix
View File

@ -7,7 +7,7 @@
, atk
, gtk3
, gtkspell3
, gnome
, adwaita-icon-theme
, glib
, goocanvas2
, gdk-pixbuf
@ -47,7 +47,7 @@ python3Packages.buildPythonApplication rec {
atk
gdk-pixbuf
glib
gnome.adwaita-icon-theme
adwaita-icon-theme
goocanvas2
fontconfig
freetype

6
pkgs/applications/office/zim/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, python3Packages, gtk3, gobject-introspection, wrapGAppsHook3, gnome }:
{ lib, stdenv, fetchurl, python3Packages, gtk3, gobject-introspection, wrapGAppsHook3, adwaita-icon-theme }:
# TODO: Declare configuration options for the following optional dependencies:
# - File stores: hg, git, bzr
@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec {
hash = "sha256-QIkNsFsWeNHEcXhGHHZyJDMMW2lNvdwMJLGxeCZaLdI=";
};
buildInputs = [ gtk3 gnome.adwaita-icon-theme ];
buildInputs = [ gtk3 adwaita-icon-theme ];
propagatedBuildInputs = with python3Packages; [ pyxdg pygobject3 ];
nativeBuildInputs = [ gobject-introspection wrapGAppsHook3 ];
@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec {
preFixup = ''
makeWrapperArgs+=(--prefix XDG_DATA_DIRS : $out/share)
makeWrapperArgs+=(--prefix XDG_DATA_DIRS : ${gnome.adwaita-icon-theme}/share)
makeWrapperArgs+=(--prefix XDG_DATA_DIRS : ${adwaita-icon-theme}/share)
makeWrapperArgs+=(--argv0 $out/bin/.zim-wrapped)
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
'';

4
pkgs/applications/office/zotero/default.nix
View File

@ -30,7 +30,7 @@
, libXrender
, libXt
, libnotify
, gnome
, adwaita-icon-theme
, libGLU
, libGL
, nspr
@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ wrapGAppsHook3 ];
buildInputs =
[ gsettings-desktop-schemas glib gtk3 gnome.adwaita-icon-theme dconf ];
[ gsettings-desktop-schemas glib gtk3 adwaita-icon-theme dconf ];
dontConfigure = true;
dontBuild = true;

4
pkgs/applications/science/electronics/kicad/default.nix
View File

@ -7,7 +7,7 @@
, callPackage
, callPackages
, gnome
, adwaita-icon-theme
, dconf
, gtk3
, wxGTK32
@ -197,7 +197,7 @@ stdenv.mkDerivation rec {
makeWrapperArgs = with passthru.libraries; [
"--prefix XDG_DATA_DIRS : ${base}/share"
"--prefix XDG_DATA_DIRS : ${hicolor-icon-theme}/share"
"--prefix XDG_DATA_DIRS : ${gnome.adwaita-icon-theme}/share"
"--prefix XDG_DATA_DIRS : ${adwaita-icon-theme}/share"
"--prefix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}"
"--prefix XDG_DATA_DIRS : ${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}"
# wrapGAppsHook3 did these two as well, no idea if it matters...

4
pkgs/applications/science/logic/coq/default.nix
View File

@ -11,7 +11,7 @@
, ocamlPackages_4_14
, ncurses
, buildIde ? null # default is true for Coq < 8.14 and false for Coq >= 8.14
, glib, gnome, wrapGAppsHook3, makeDesktopItem, copyDesktopItems
, glib, adwaita-icon-theme, wrapGAppsHook3, makeDesktopItem, copyDesktopItems
, csdp ? null
, version, coq-version ? null
}@args:
@ -154,7 +154,7 @@ self = stdenv.mkDerivation {
buildInputs = [ ncurses ]
++ optionals buildIde
(if coqAtLeast "8.10"
then [ ocamlPackages.lablgtk3-sourceview3 glib gnome.adwaita-icon-theme ]
then [ ocamlPackages.lablgtk3-sourceview3 glib adwaita-icon-theme ]
else [ ocamlPackages.lablgtk ])
;

4
pkgs/applications/science/math/wxmaxima/default.nix
View File

@ -6,7 +6,7 @@
, gettext
, maxima
, wxGTK
, gnome
, adwaita-icon-theme
, glib
}:
@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs:{
wxGTK
maxima
# So it won't embed svg files into headers.
gnome.adwaita-icon-theme
adwaita-icon-theme
# So it won't crash under Sway.
glib
];

4
pkgs/applications/version-management/deepgit/default.nix
View File

@ -1,7 +1,7 @@
{ copyDesktopItems
, fetchurl
, glib
, gnome
, adwaita-icon-theme
, gtk3
, jre
, lib
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
gnome.adwaita-icon-theme
adwaita-icon-theme
gtk3
jre
];

Some files were not shown because too many files have changed in this diff Show More