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

zenity: Move from gnome scope to top-level

Browse Source 
It is widely used outside gnome, not much inside.
This commit is contained in:
Jan Tojnar 2024-06-22 14:28:53 +02:00
parent 2adc7d7340
commit b69ed4249d
44 changed files with 87 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -132,7 +132,7 @@ in {
gnome-menus gnome-menus
# Required by Budgie Control Center. # Required by Budgie Control Center.
gnome.zenity zenity
# Provides `gsettings`. # Provides `gsettings`.
glib glib

2
nixos/tests/ydotool.nix
View File

@ -9,7 +9,7 @@ let
textInput = "This works."; textInput = "This works.";
inputBoxText = "Enter input"; inputBoxText = "Enter input";
inputBox = pkgs.writeShellScript "zenity-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 = '' asUser = ''
def as_user(cmd: str): def as_user(cmd: str):

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

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

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

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

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

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

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

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, libjack2, libsndfile, xorg, freetype { 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 , pango, pkg-config, catch2
}: }:
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
libxkbcommon libxkbcommon
cairo cairo
glib glib
gnome.zenity zenity
freetype freetype
pango pango
]; ];
@ -47,9 +47,9 @@ stdenv.mkDerivation rec {
cp ${catch2}/include/catch2/catch.hpp tests/catch2/catch.hpp cp ${catch2}/include/catch2/catch.hpp tests/catch2/catch.hpp
substituteInPlace plugins/editor/external/vstgui4/vstgui/lib/platform/linux/x11fileselector.cpp \ 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 \ 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" ]; cmakeFlags = [ "-DSFIZZ_TESTS=ON" ];

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

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

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

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

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

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

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

@ -17,7 +17,7 @@
, libxkbcommon , libxkbcommon
, vulkan-loader , vulkan-loader
, wayland , wayland
, gnome , zenity
, libsForQt5 , libsForQt5
}: }:
@ -85,7 +85,7 @@ rustPlatform.buildRustPackage rec {
in in
'' ''
patchelf --set-rpath "${libPath}" "$out/bin/ludusavi" 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/editors/vim/plugins/overrides.nix
View File

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

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

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

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

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

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

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

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

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

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

@ -7,7 +7,7 @@
let let
qt5Deps = pkgs: with pkgs.qt5; [ qtbase qtmultimedia ]; 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; [ xorgDeps = pkgs: with pkgs.xorg; [
libX11 libXrender libXrandr libxcb libXmu libpthreadstubs libXext libXdmcp libX11 libXrender libXrandr libxcb libXmu libpthreadstubs libXext libXdmcp
libXxf86vm libXinerama libSM libXv libXaw libXi libXcursor libXcomposite libXxf86vm libXinerama libSM libXv libXaw libXi libXcursor libXcomposite

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

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

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

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

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

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

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

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

6
pkgs/applications/virtualization/quickgui/default.nix
View File

@ -5,7 +5,7 @@
, dpkg , dpkg
, wrapGAppsHook3 , wrapGAppsHook3
, quickemu , quickemu
, gnome , zenity
}: }:
stdenvNoCC.mkDerivation rec { stdenvNoCC.mkDerivation rec {
@ -25,7 +25,7 @@ stdenvNoCC.mkDerivation rec {
buildInputs = [ buildInputs = [
quickemu quickemu
gnome.zenity zenity
]; ];
strictDeps = true; strictDeps = true;
@ -42,7 +42,7 @@ stdenvNoCC.mkDerivation rec {
preFixup = '' preFixup = ''
gappsWrapperArgs+=( gappsWrapperArgs+=(
--prefix PATH : ${lib.makeBinPath [ quickemu gnome.zenity ]} --prefix PATH : ${lib.makeBinPath [ quickemu zenity ]}
) )
''; '';

2
pkgs/build-support/appimage/default.nix
View File

@ -74,7 +74,7 @@ rec {
targetPkgs = pkgs: with pkgs; [ targetPkgs = pkgs: with pkgs; [
gtk3 gtk3
bashInteractive bashInteractive
gnome.zenity zenity
xorg.xrandr xorg.xrandr
which which
perl perl

6
pkgs/by-name/_2/_2ship2harkinian/package.nix
View File

@ -15,7 +15,7 @@
libpulseaudio, libpulseaudio,
libpng, libpng,
imagemagick, imagemagick,
gnome, zenity,
makeWrapper, makeWrapper,
imgui, imgui,
stormlib, stormlib,
@ -122,7 +122,7 @@ stdenv.mkDerivation (finalAttrs: {
SDL2 SDL2
libpulseaudio libpulseaudio
libpng libpng
gnome.zenity zenity
imgui' imgui'
stormlib' stormlib'
libzip libzip
@ -183,7 +183,7 @@ stdenv.mkDerivation (finalAttrs: {
''; '';
fixupPhase = '' fixupPhase = ''
wrapProgram $out/2s2h/2s2h.elf --prefix PATH ":" ${lib.makeBinPath [ gnome.zenity ]} wrapProgram $out/2s2h/2s2h.elf --prefix PATH ":" ${lib.makeBinPath [ zenity ]}
''; '';
desktopItems = [ desktopItems = [

4
pkgs/by-name/sv/svp/package.nix
View File

@ -7,7 +7,6 @@
, copyDesktopItems , copyDesktopItems
, ffmpeg , ffmpeg
, glibc , glibc
, gnome
, jq , jq
, lib , lib
, libmediainfo , libmediainfo
@ -20,6 +19,7 @@
, vapoursynth , vapoursynth
, xdg-utils , xdg-utils
, xorg , xorg
, zenity
}: }:
let let
mpvForSVP = callPackage ./mpv.nix { }; mpvForSVP = callPackage ./mpv.nix { };
@ -42,7 +42,7 @@ let
fakeLsof fakeLsof
ffmpeg.bin ffmpeg.bin
glibc glibc
gnome.zenity zenity
libmediainfo libmediainfo
libsForQt5.qtbase libsForQt5.qtbase
libsForQt5.qtwayland libsForQt5.qtwayland

4
pkgs/by-name/th/thcrap-steam-proton-wrapper/package.nix
View File

@ -5,7 +5,7 @@
, makeWrapper , makeWrapper
, bash , bash
, subversion , subversion
, gnome , zenity
}: }:
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "thcrap-proton"; pname = "thcrap-proton";
@ -37,7 +37,7 @@ stdenv.mkDerivation {
lib.makeBinPath [ lib.makeBinPath [
bash bash
subversion subversion
gnome.zenity zenity
] ]
} }
''; '';

6
pkgs/by-name/tr/trigger-control/package.nix
View File

@ -10,13 +10,9 @@
, libdecor , libdecor
, libnotify , libnotify
, dejavu_fonts , dejavu_fonts
, gnome , zenity
}: }:
let
inherit (gnome) zenity;
in
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "trigger-control"; pname = "trigger-control";
version = "1.5.1"; version = "1.5.1";

4
pkgs/by-name/wi/wifi-qr/package.nix
View File

@ -2,7 +2,7 @@
, fetchFromGitHub , fetchFromGitHub
, installShellFiles , installShellFiles
, makeWrapper , makeWrapper
, gnome , zenity
, ncurses , ncurses
, networkmanager , networkmanager
, patsh , patsh
@ -26,7 +26,7 @@ stdenvNoCC.mkDerivation {
}; };
buildInputs = [ buildInputs = [
gnome.zenity zenity
ncurses ncurses
networkmanager networkmanager
procps procps

1
pkgs/desktops/gnome/core/zenity/default.nix → pkgs/by-name/ze/zenity/package.nix
View File

@ -42,7 +42,6 @@ stdenv.mkDerivation (finalAttrs: {
passthru = { passthru = {
updateScript = gnome.updateScript { updateScript = gnome.updateScript {
packageName = "zenity"; packageName = "zenity";
attrPath = "gnome.zenity";
}; };
}; };

3
pkgs/desktops/budgie/budgie-desktop/default.nix
View File

@ -33,6 +33,7 @@
, vala , vala
, xfce , xfce
, wrapGAppsHook3 , wrapGAppsHook3
, zenity
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
@ -70,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: {
gnome-desktop gnome-desktop
gnome.gnome-settings-daemon gnome.gnome-settings-daemon
gnome.mutter gnome.mutter
gnome.zenity zenity
graphene graphene
gst_all_1.gstreamer gst_all_1.gstreamer
gst_all_1.gst-plugins-base gst_all_1.gst-plugins-base

4
pkgs/desktops/cinnamon/muffin/default.nix
View File

@ -8,7 +8,6 @@
, desktop-file-utils , desktop-file-utils
, egl-wayland , egl-wayland
, glib , glib
, gnome
, gobject-introspection , gobject-introspection
, graphene , graphene
, gtk3 , gtk3
@ -36,6 +35,7 @@
, wrapGAppsHook3 , wrapGAppsHook3
, xorgserver , xorgserver
, xwayland , xwayland
, zenity
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
patches = [ patches = [
(substituteAll { (substituteAll {
src = ./fix-paths.patch; src = ./fix-paths.patch;
zenity = gnome.zenity; inherit zenity;
}) })
]; ];

4
pkgs/desktops/gnome/default.nix
View File

@ -118,9 +118,6 @@ in
yelp-xsl = callPackage ./core/yelp-xsl { }; yelp-xsl = callPackage ./core/yelp-xsl { };
zenity = callPackage ./core/zenity { };
#### Apps (http://ftp.acc.umu.se/pub/GNOME/apps/) #### Apps (http://ftp.acc.umu.se/pub/GNOME/apps/)
accerciser = callPackage ./apps/accerciser { }; accerciser = callPackage ./apps/accerciser { };
@ -246,6 +243,7 @@ in
rygel = lib.warn "The ‘gnome.rygel’ was moved to top-level. Please use ‘pkgs.rygel’ directly." pkgs.rygel; # Added on 2024-06-22. rygel = lib.warn "The ‘gnome.rygel’ was moved to top-level. Please use ‘pkgs.rygel’ directly." pkgs.rygel; # Added on 2024-06-22.
seahorse = lib.warn "The ‘gnome.seahorse’ was moved to top-level. Please use ‘pkgs.seahorse’ directly." pkgs.seahorse; # Added on 2024-06-22. seahorse = lib.warn "The ‘gnome.seahorse’ was moved to top-level. Please use ‘pkgs.seahorse’ directly." pkgs.seahorse; # Added on 2024-06-22.
simple-scan = lib.warn "The ‘gnome.simple-scan’ was moved to top-level. Please use ‘pkgs.simple-scan’ directly." pkgs.simple-scan; # Added on 2024-06-22. simple-scan = lib.warn "The ‘gnome.simple-scan’ was moved to top-level. Please use ‘pkgs.simple-scan’ directly." pkgs.simple-scan; # Added on 2024-06-22.
zenity = lib.warn "The ‘gnome.zenity’ was moved to top-level. Please use ‘pkgs.zenity’ directly." pkgs.zenity; # Added on 2024-06-22.
#### Removals #### Removals
anjuta = throw "`anjuta` was removed after not being maintained upstream and losing control of its official domain."; # 2024-01-16 anjuta = throw "`anjuta` was removed after not being maintained upstream and losing control of its official domain."; # 2024-01-16

6
pkgs/desktops/mate/marco/default.nix
View File

@ -11,7 +11,7 @@
, libXpresent , libXpresent
, libXres , libXres
, libstartup_notification , libstartup_notification
, gnome , zenity
, glib , glib
, gtk3 , gtk3
, mate-desktop , mate-desktop
@ -45,14 +45,14 @@ stdenv.mkDerivation rec {
libXres libXres
libstartup_notification libstartup_notification
gtk3 gtk3
gnome.zenity zenity
mate-desktop mate-desktop
mate-settings-daemon mate-settings-daemon
]; ];
postPatch = '' postPatch = ''
substituteInPlace src/core/util.c \ substituteInPlace src/core/util.c \
--replace-fail 'argvl[i++] = "zenity"' 'argvl[i++] = "${gnome.zenity}/bin/zenity"' --replace-fail 'argvl[i++] = "zenity"' 'argvl[i++] = "${zenity}/bin/zenity"'
''; '';
env.NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; env.NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";

4
pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix
View File

@ -16,7 +16,7 @@
, xfce4-panel , xfce4-panel
, xfconf , xfconf
, curl , curl
, gnome , zenity
, jq , jq
, xclip , xclip
}: }:
@ -54,7 +54,7 @@ mkXfceDerivation {
# For Imgur upload action # For Imgur upload action
# https://gitlab.xfce.org/apps/xfce4-screenshooter/-/merge_requests/51 # https://gitlab.xfce.org/apps/xfce4-screenshooter/-/merge_requests/51
gappsWrapperArgs+=( gappsWrapperArgs+=(
--prefix PATH : ${lib.makeBinPath [ curl gnome.zenity jq xclip ]} --prefix PATH : ${lib.makeBinPath [ curl zenity jq xclip ]}
) )
''; '';

2
pkgs/games/heroic/fhsenv.nix
View File

@ -20,7 +20,7 @@ buildFHSEnv {
gamemode gamemode
curl curl
gawk gawk
gnome.zenity zenity
plasma5Packages.kdialog plasma5Packages.kdialog
mangohud mangohud
nettools nettools

4
pkgs/games/megaglest/default.nix
View File

@ -1,6 +1,6 @@
{ lib, stdenv, cmake, pkg-config, git, curl, SDL2, xercesc, openal, lua, libvlc { lib, stdenv, cmake, pkg-config, git, curl, SDL2, xercesc, openal, lua, libvlc
, libjpeg, wxGTK32, cppunit, ftgl, glew, libogg, libvorbis, buildEnv, libpng , libjpeg, wxGTK32, cppunit, ftgl, glew, libogg, libvorbis, buildEnv, libpng
, fontconfig, freetype, xorg, makeWrapper, bash, which, gnome, libGLU, glib , fontconfig, freetype, xorg, makeWrapper, bash, which, zenity, libGLU, glib
, fetchFromGitHub, fetchpatch , fetchFromGitHub, fetchpatch
}: }:
let let
@ -13,7 +13,7 @@ let
}; };
path-env = buildEnv { path-env = buildEnv {
name = "megaglest-path-env"; name = "megaglest-path-env";
paths = [ bash which gnome.zenity ]; paths = [ bash which zenity ];
}; };
in in
stdenv.mkDerivation { stdenv.mkDerivation {

2
pkgs/games/openra_2019/common.nix
View File

@ -4,6 +4,8 @@
{ lib, makeSetupHook, curl, unzip, dos2unix, pkg-config, makeWrapper { lib, makeSetupHook, curl, unzip, dos2unix, pkg-config, makeWrapper
, lua, mono, python3 , lua, mono, python3
, libGL, freetype, openal, SDL2 , libGL, freetype, openal, SDL2
# It is not necessary to run the game, but it is nicer to be given an error dialog in the case of failure,
# rather than having to look to the logs why it is not starting.
, zenity , zenity
}: }:

3
pkgs/games/openra_2019/default.nix
View File

@ -24,9 +24,6 @@ let
fArgs = lib.functionArgs f; fArgs = lib.functionArgs f;
in f (builtins.intersectAttrs fArgs pkgs // { in f (builtins.intersectAttrs fArgs pkgs // {
lua = pkgs.lua5_1; lua = pkgs.lua5_1;
# It is not necessary to run the game, but it is nicer to be given an error dialog in the case of failure,
# rather than having to look to the logs why it is not starting.
inherit (pkgs.gnome) zenity;
}); });
/* Building a set of engines or mods requires some dependencies as well, /* Building a set of engines or mods requires some dependencies as well,

3
pkgs/games/openra_2019/packages.nix
View File

@ -13,9 +13,6 @@ let
*/ */
common = let f = import ./common.nix; in f (builtins.intersectAttrs (builtins.functionArgs f) pkgs // { common = let f = import ./common.nix; in f (builtins.intersectAttrs (builtins.functionArgs f) pkgs // {
lua = pkgs.lua5_1; lua = pkgs.lua5_1;
# It is not necessary to run the game, but it is nicer to be given an error dialog in the case of failure,
# rather than having to look to the logs why it is not starting.
inherit (pkgs.gnome) zenity;
}); });
/* Building a set of engines or mods requires some dependencies as well, /* Building a set of engines or mods requires some dependencies as well,

6
pkgs/games/shipwright/default.nix
View File

@ -22,7 +22,7 @@
, libpulseaudio , libpulseaudio
, libpng , libpng
, imagemagick , imagemagick
, gnome , zenity
, makeWrapper , makeWrapper
, darwin , darwin
, libicns , libicns
@ -84,7 +84,7 @@ stdenv.mkDerivation (finalAttrs: {
libXi libXi
libXext libXext
libpulseaudio libpulseaudio
gnome.zenity zenity
] ++ lib.optionals stdenv.isDarwin [ ] ++ lib.optionals stdenv.isDarwin [
IOSurface IOSurface
Metal Metal
@ -168,7 +168,7 @@ stdenv.mkDerivation (finalAttrs: {
''; '';
fixupPhase = lib.optionalString stdenv.isLinux '' fixupPhase = lib.optionalString stdenv.isLinux ''
wrapProgram $out/lib/soh.elf --prefix PATH ":" ${lib.makeBinPath [ gnome.zenity ]} wrapProgram $out/lib/soh.elf --prefix PATH ":" ${lib.makeBinPath [ zenity ]}
''; '';
desktopItems = [ desktopItems = [

2
pkgs/games/steam/fhsenv.nix
View File

@ -83,7 +83,7 @@ in buildFHSEnv rec {
targetPkgs = pkgs: with pkgs; [ targetPkgs = pkgs: with pkgs; [
steam steam
# License agreement # License agreement
gnome.zenity zenity
] ++ commonTargetPkgs pkgs; ] ++ commonTargetPkgs pkgs;
multiPkgs = pkgs: with pkgs; [ multiPkgs = pkgs: with pkgs; [

4
pkgs/tools/misc/kodi-cli/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, makeWrapper, curl, bash, jq, youtube-dl, gnome }: { lib, stdenv, fetchFromGitHub, makeWrapper, curl, bash, jq, youtube-dl, zenity }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "kodi-cli"; pname = "kodi-cli";
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
cp -a kodi-cli $out/bin cp -a kodi-cli $out/bin
wrapProgram $out/bin/kodi-cli --prefix PATH : ${lib.makeBinPath [ curl bash ]} wrapProgram $out/bin/kodi-cli --prefix PATH : ${lib.makeBinPath [ curl bash ]}
cp -a playlist_to_kodi $out/bin cp -a playlist_to_kodi $out/bin
wrapProgram $out/bin/playlist_to_kodi --prefix PATH : ${lib.makeBinPath [ curl bash gnome.zenity jq youtube-dl ]} wrapProgram $out/bin/playlist_to_kodi --prefix PATH : ${lib.makeBinPath [ curl bash zenity jq youtube-dl ]}
''; '';
meta = with lib; { meta = with lib; {

6
pkgs/tools/wayland/wl-color-picker/default.nix
View File

@ -3,7 +3,7 @@
, fetchFromGitHub , fetchFromGitHub
, slurp , slurp
, grim , grim
, gnome , zenity
, wl-clipboard , wl-clipboard
, imagemagick , imagemagick
, makeWrapper , makeWrapper
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
--replace 'grim' "${grim}/bin/grim" \ --replace 'grim' "${grim}/bin/grim" \
--replace 'slurp' "${slurp}/bin/slurp" \ --replace 'slurp' "${slurp}/bin/slurp" \
--replace 'convert' "${imagemagick}/bin/convert" \ --replace 'convert' "${imagemagick}/bin/convert" \
--replace 'zenity' "${gnome.zenity}/bin/zenity" \ --replace 'zenity' "${zenity}/bin/zenity" \
--replace 'wl-copy' "${wl-clipboard}/bin/wl-copy" --replace 'wl-copy' "${wl-clipboard}/bin/wl-copy"
''; '';
@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
grim grim
slurp slurp
imagemagick imagemagick
gnome.zenity zenity
wl-clipboard wl-clipboard
]} ]}
mkdir -p $out/bin mkdir -p $out/bin

15
pkgs/top-level/all-packages.nix
View File

@ -1641,7 +1641,6 @@ with pkgs;
aj-snapshot = callPackage ../applications/audio/aj-snapshot { }; aj-snapshot = callPackage ../applications/audio/aj-snapshot { };
ajour = callPackage ../tools/games/ajour { ajour = callPackage ../tools/games/ajour {
inherit (gnome) zenity;
inherit (plasma5Packages) kdialog; inherit (plasma5Packages) kdialog;
}; };
@ -2774,9 +2773,7 @@ with pkgs;
vice = callPackage ../applications/emulators/vice { }; vice = callPackage ../applications/emulators/vice { };
winetricks = callPackage ../applications/emulators/wine/winetricks.nix { winetricks = callPackage ../applications/emulators/wine/winetricks.nix { };
inherit (gnome) zenity;
};
xcpc = callPackage ../applications/emulators/xcpc { }; xcpc = callPackage ../applications/emulators/xcpc { };
@ -32480,9 +32477,7 @@ with pkgs;
merkaartor = libsForQt5.callPackage ../applications/misc/merkaartor { }; merkaartor = libsForQt5.callPackage ../applications/misc/merkaartor { };
mepo = callPackage ../applications/misc/mepo { mepo = callPackage ../applications/misc/mepo { };
inherit (gnome) zenity;
};
meshcentral = callPackage ../tools/admin/meshcentral { }; meshcentral = callPackage ../tools/admin/meshcentral { };
@ -33952,9 +33947,7 @@ with pkgs;
rusty-psn-gui = rusty-psn.override { withGui = true; }; rusty-psn-gui = rusty-psn.override { withGui = true; };
rymcast = callPackage ../applications/audio/rymcast { rymcast = callPackage ../applications/audio/rymcast { };
inherit (gnome) zenity;
};
rymdport = callPackage ../applications/networking/rymdport { rymdport = callPackage ../applications/networking/rymdport {
inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
@ -34332,7 +34325,6 @@ with pkgs;
surf = callPackage ../applications/networking/browsers/surf { gtk = gtk2; }; surf = callPackage ../applications/networking/browsers/surf { gtk = gtk2; };
surge = callPackage ../applications/audio/surge { surge = callPackage ../applications/audio/surge {
inherit (gnome) zenity;
git = gitMinimal; git = gitMinimal;
}; };
@ -35698,7 +35690,6 @@ with pkgs;
alfis = callPackage ../applications/blockchains/alfis { alfis = callPackage ../applications/blockchains/alfis {
inherit (darwin.apple_sdk.frameworks) Cocoa Security WebKit; inherit (darwin.apple_sdk.frameworks) Cocoa Security WebKit;
inherit (gnome) zenity;
}; };
alfis-nogui = alfis.override { alfis-nogui = alfis.override {
withGui = false; withGui = false;

2
pkgs/top-level/lua-packages.nix
View File

@ -173,7 +173,7 @@ rec {
}) {}; }) {};
nfd = callPackage ../development/lua-modules/nfd { nfd = callPackage ../development/lua-modules/nfd {
inherit (pkgs.gnome) zenity; inherit (pkgs) zenity;
inherit (pkgs.darwin.apple_sdk.frameworks) AppKit; inherit (pkgs.darwin.apple_sdk.frameworks) AppKit;
}; };