summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2024-06-22 14:28:53 +0200
committerJan Tojnar <jtojnar@gmail.com>2024-07-01 08:26:47 +0200
commitb69ed4249d7ad2266043a7c16cf0b0cca7af08f6 (patch)
treef5c2dff5dfdf729921968bb349bb868c61137eff
parent2adc7d7340a52b6247ccf9c36cf05ea1c5a1f00b (diff)
zenity: Move from gnome scope to top-level
It is widely used outside gnome, not much inside.
-rw-r--r--nixos/modules/services/x11/desktop-managers/budgie.nix2
-rw-r--r--nixos/tests/ydotool.nix2
-rw-r--r--pkgs/applications/audio/bespokesynth/default.nix6
-rw-r--r--pkgs/applications/audio/helio-workstation/default.nix6
-rw-r--r--pkgs/applications/audio/plugdata/default.nix4
-rw-r--r--pkgs/applications/audio/sfizz/default.nix8
-rw-r--r--pkgs/applications/audio/spotify/linux.nix4
-rw-r--r--pkgs/applications/audio/touchosc/default.nix4
-rw-r--r--pkgs/applications/audio/vcv-rack/default.nix6
-rw-r--r--pkgs/applications/backup/ludusavi/default.nix4
-rw-r--r--pkgs/applications/editors/vim/plugins/overrides.nix4
-rw-r--r--pkgs/applications/graphics/geeqie/default.nix10
-rw-r--r--pkgs/applications/graphics/kodelife/default.nix4
-rw-r--r--pkgs/applications/graphics/tev/default.nix4
-rw-r--r--pkgs/applications/misc/inochi2d/generic.nix4
-rw-r--r--pkgs/applications/misc/lutris/fhsenv.nix2
-rw-r--r--pkgs/applications/misc/parsec/bin.nix3
-rw-r--r--pkgs/applications/networking/instant-messengers/fluffychat/default.nix4
-rw-r--r--pkgs/applications/office/autokey/default.nix4
-rw-r--r--pkgs/applications/office/pdfmm/default.nix6
-rw-r--r--pkgs/applications/virtualization/quickgui/default.nix6
-rw-r--r--pkgs/build-support/appimage/default.nix2
-rw-r--r--pkgs/by-name/_2/_2ship2harkinian/package.nix6
-rw-r--r--pkgs/by-name/sv/svp/package.nix4
-rw-r--r--pkgs/by-name/th/thcrap-steam-proton-wrapper/package.nix4
-rw-r--r--pkgs/by-name/tr/trigger-control/package.nix6
-rw-r--r--pkgs/by-name/wi/wifi-qr/package.nix4
-rw-r--r--pkgs/by-name/ze/zenity/package.nix (renamed from pkgs/desktops/gnome/core/zenity/default.nix)1
-rw-r--r--pkgs/desktops/budgie/budgie-desktop/default.nix3
-rw-r--r--pkgs/desktops/cinnamon/muffin/default.nix4
-rw-r--r--pkgs/desktops/gnome/default.nix4
-rw-r--r--pkgs/desktops/mate/marco/default.nix6
-rw-r--r--pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix4
-rw-r--r--pkgs/games/heroic/fhsenv.nix2
-rw-r--r--pkgs/games/megaglest/default.nix4
-rw-r--r--pkgs/games/openra_2019/common.nix2
-rw-r--r--pkgs/games/openra_2019/default.nix3
-rw-r--r--pkgs/games/openra_2019/packages.nix3
-rw-r--r--pkgs/games/shipwright/default.nix6
-rw-r--r--pkgs/games/steam/fhsenv.nix2
-rw-r--r--pkgs/tools/misc/kodi-cli/default.nix4
-rw-r--r--pkgs/tools/wayland/wl-color-picker/default.nix6
-rw-r--r--pkgs/top-level/all-packages.nix15
-rw-r--r--pkgs/top-level/lua-packages.nix2
44 files changed, 87 insertions, 107 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/budgie.nix b/nixos/modules/services/x11/desktop-managers/budgie.nix
index 6acfce034b85..5e81b5ef8411 100644
--- a/nixos/modules/services/x11/desktop-managers/budgie.nix
+++ b/nixos/modules/services/x11/desktop-managers/budgie.nix
@@ -132,7 +132,7 @@ in {
gnome-menus
# Required by Budgie Control Center.
- gnome.zenity
+ zenity
# Provides `gsettings`.
glib
diff --git a/nixos/tests/ydotool.nix b/nixos/tests/ydotool.nix
index 45e3d27adeb4..7a739392aa56 100644
--- a/nixos/tests/ydotool.nix
+++ b/nixos/tests/ydotool.nix
@@ -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):
diff --git a/pkgs/applications/audio/bespokesynth/default.nix b/pkgs/applications/audio/bespokesynth/default.nix
index 752088fcd822..83c5af0a53fc 100644
--- a/pkgs/applications/audio/bespokesynth/default.nix
+++ b/pkgs/applications/audio/bespokesynth/default.nix
@@ -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 ]))
]}'
'';
diff --git a/pkgs/applications/audio/helio-workstation/default.nix b/pkgs/applications/audio/helio-workstation/default.nix
index dc4bf6333d38..79f0c61af78e 100644
--- a/pkgs/applications/audio/helio-workstation/default.nix
+++ b/pkgs/applications/audio/helio-workstation/default.nix
@@ -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
diff --git a/pkgs/applications/audio/plugdata/default.nix b/pkgs/applications/audio/plugdata/default.nix
index 9af5c4a9fa85..e58e5aabcd81 100644
--- a/pkgs/applications/audio/plugdata/default.nix
+++ b/pkgs/applications/audio/plugdata/default.nix
@@ -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
diff --git a/pkgs/applications/audio/sfizz/default.nix b/pkgs/applications/audio/sfizz/default.nix
index c6a0ac824566..3aa2b6cf6deb 100644
--- a/pkgs/applications/audio/sfizz/default.nix
+++ b/pkgs/applications/audio/sfizz/default.nix
@@ -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" ];
diff --git a/pkgs/applications/audio/spotify/linux.nix b/pkgs/applications/audio/spotify/linux.nix
index 8886e851c3c9..43b4ae243540 100644
--- a/pkgs/applications/audio/spotify/linux.nix
+++ b/pkgs/applications/audio/spotify/linux.nix
@@ -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
diff --git a/pkgs/applications/audio/touchosc/default.nix b/pkgs/applications/audio/touchosc/default.nix
index bc53b296357b..61a8854141b8 100644
--- a/pkgs/applications/audio/touchosc/default.nix
+++ b/pkgs/applications/audio/touchosc/default.nix
@@ -18,7 +18,7 @@
, libXrender
, libXxf86vm
, libglvnd
-, gnome
+, zenity
}:
let
@@ -39,7 +39,7 @@ let
];
runBinDeps = [
- gnome.zenity
+ zenity
];
in
diff --git a/pkgs/applications/audio/vcv-rack/default.nix b/pkgs/applications/audio/vcv-rack/default.nix
index 7a1ded3e2f82..0d02e5a686a1 100644
--- a/pkgs/applications/audio/vcv-rack/default.nix
+++ b/pkgs/applications/audio/vcv-rack/default.nix
@@ -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
diff --git a/pkgs/applications/backup/ludusavi/default.nix b/pkgs/applications/backup/ludusavi/default.nix
index e2dfc1456984..c96b99162292 100644
--- a/pkgs/applications/backup/ludusavi/default.nix
+++ b/pkgs/applications/backup/ludusavi/default.nix
@@ -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 ]}
'';
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index f2d7640a83e1..b522775fef1c 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -25,7 +25,6 @@
, fzf
, gawk
, git
-, gnome
, himalaya
, htop
, jq
@@ -58,6 +57,7 @@
, xorg
, xxd
, zathura
+, zenity
, zsh
, # codeium-nvim dependencies
codeium
@@ -1603,7 +1603,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;
diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix
index 4eeb330f6d27..3c44ae0bddf1 100644
--- a/pkgs/applications/graphics/geeqie/default.nix
+++ b/pkgs/applications/graphics/geeqie/default.nix
@@ -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;
diff --git a/pkgs/applications/graphics/kodelife/default.nix b/pkgs/applications/graphics/kodelife/default.nix
index 9bfc5d7aec19..1c92928b778c 100644
--- a/pkgs/applications/graphics/kodelife/default.nix
+++ b/pkgs/applications/graphics/kodelife/default.nix
@@ -19,7 +19,7 @@
, libXrender
, libXxf86vm
, libglvnd
-, gnome
+, zenity
}:
let
@@ -39,7 +39,7 @@ let
];
runBinDeps = [
- gnome.zenity
+ zenity
];
in
diff --git a/pkgs/applications/graphics/tev/default.nix b/pkgs/applications/graphics/tev/default.nix
index 288eb7aef6ca..76c8b7f692af 100644
--- a/pkgs/applications/graphics/tev/default.nix
+++ b/pkgs/applications/graphics/tev/default.nix
@@ -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";
diff --git a/pkgs/applications/misc/inochi2d/generic.nix b/pkgs/applications/misc/inochi2d/generic.nix
index 6666a63ca1ed..769b44204420 100644
--- a/pkgs/applications/misc/inochi2d/generic.nix
+++ b/pkgs/applications/misc/inochi2d/generic.nix
@@ -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 = {
diff --git a/pkgs/applications/misc/lutris/fhsenv.nix b/pkgs/applications/misc/lutris/fhsenv.nix
index 3d241f30efa2..c1beb102cdd6 100644
--- a/pkgs/applications/misc/lutris/fhsenv.nix
+++ b/pkgs/applications/misc/lutris/fhsenv.nix
@@ -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
diff --git a/pkgs/applications/misc/parsec/bin.nix b/pkgs/applications/misc/parsec/bin.nix
index e6c250afc321..436822aa2b88 100644
--- a/pkgs/applications/misc/parsec/bin.nix
+++ b/pkgs/applications/misc/parsec/bin.nix
@@ -21,8 +21,7 @@
, libjpeg8
, curl
, vulkan-loader
-, gnome
-, zenity ? gnome.zenity
+, zenity
}:
stdenvNoCC.mkDerivation {
diff --git a/pkgs/applications/networking/instant-messengers/fluffychat/default.nix b/pkgs/applications/networking/instant-messengers/fluffychat/default.nix
index 66d7abc0822d..5d4978783785 100644
--- a/pkgs/applications/networking/instant-messengers/fluffychat/default.nix
+++ b/pkgs/applications/networking/instant-messengers/fluffychat/default.nix
@@ -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}";
diff --git a/pkgs/applications/office/autokey/default.nix b/pkgs/applications/office/autokey/default.nix
index d05c83cb1999..91700299400a 100644
--- a/pkgs/applications/office/autokey/default.nix
+++ b/pkgs/applications/office/autokey/default.nix
@@ -6,7 +6,7 @@
, gtksourceview3
, libappindicator-gtk3
, libnotify
-, gnome
+, zenity
, wmctrl
}:
@@ -41,7 +41,7 @@ python3Packages.buildPythonApplication rec {
];
runtimeDeps = [
- gnome.zenity
+ zenity
wmctrl
];
diff --git a/pkgs/applications/office/pdfmm/default.nix b/pkgs/applications/office/pdfmm/default.nix
index 5be76fa51685..9f4f17f893c9 100644
--- a/pkgs/applications/office/pdfmm/default.nix
+++ b/pkgs/applications/office/pdfmm/default.nix
@@ -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;
};
diff --git a/pkgs/applications/virtualization/quickgui/default.nix b/pkgs/applications/virtualization/quickgui/default.nix
index 244e438626e0..cb3c79f36aa9 100644
--- a/pkgs/applications/virtualization/quickgui/default.nix
+++ b/pkgs/applications/virtualization/quickgui/default.nix
@@ -5,7 +5,7 @@
, dpkg
, wrapGAppsHook3
, quickemu
-, gnome
+, zenity
}:
stdenvNoCC.mkDerivation rec {
@@ -25,7 +25,7 @@ stdenvNoCC.mkDerivation rec {
buildInputs = [
quickemu
- gnome.zenity
+ zenity
];
strictDeps = true;
@@ -42,7 +42,7 @@ stdenvNoCC.mkDerivation rec {
preFixup = ''
gappsWrapperArgs+=(
- --prefix PATH : ${lib.makeBinPath [ quickemu gnome.zenity ]}
+ --prefix PATH : ${lib.makeBinPath [ quickemu zenity ]}
)
'';
diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix
index 0d44a5ab23e9..638e29c3bc3b 100644
--- a/pkgs/build-support/appimage/default.nix
+++ b/pkgs/build-support/appimage/default.nix
@@ -74,7 +74,7 @@ rec {
targetPkgs = pkgs: with pkgs; [
gtk3
bashInteractive
- gnome.zenity
+ zenity
xorg.xrandr
which
perl
diff --git a/pkgs/by-name/_2/_2ship2harkinian/package.nix b/pkgs/by-name/_2/_2ship2harkinian/package.nix
index 0be042d174f2..c0c9ee4a7fa8 100644
--- a/pkgs/by-name/_2/_2ship2harkinian/package.nix
+++ b/pkgs/by-name/_2/_2ship2harkinian/package.nix
@@ -15,7 +15,7 @@
libpulseaudio,
libpng,
imagemagick,
- gnome,
+ zenity,
makeWrapper,
imgui,
stormlib,
@@ -122,7 +122,7 @@ stdenv.mkDerivation (finalAttrs: {
SDL2
libpulseaudio
libpng
- gnome.zenity
+ zenity
imgui'
stormlib'
libzip
@@ -183,7 +183,7 @@ stdenv.mkDerivation (finalAttrs: {
'';
fixupPhase = ''
- wrapProgram $out/2s2h/2s2h.elf --prefix PATH ":" ${lib.makeBinPath [ gnome.zenity ]}
+ wrapProgram $out/2s2h/2s2h.elf --prefix PATH ":" ${lib.makeBinPath [ zenity ]}
'';
desktopItems = [
diff --git a/pkgs/by-name/sv/svp/package.nix b/pkgs/by-name/sv/svp/package.nix
index c34507c91e44..30e540ba7416 100644
--- a/pkgs/by-name/sv/svp/package.nix
+++ b/pkgs/by-name/sv/svp/package.nix
@@ -7,7 +7,6 @@
, copyDesktopItems
, ffmpeg
, glibc
-, gnome
, jq
, lib
, libmediainfo
@@ -20,6 +19,7 @@
, vapoursynth
, xdg-utils
, xorg
+, zenity
}:
let
mpvForSVP = callPackage ./mpv.nix { };
@@ -42,7 +42,7 @@ let
fakeLsof
ffmpeg.bin
glibc
- gnome.zenity
+ zenity
libmediainfo
libsForQt5.qtbase
libsForQt5.qtwayland
diff --git a/pkgs/by-name/th/thcrap-steam-proton-wrapper/package.nix b/pkgs/by-name/th/thcrap-steam-proton-wrapper/package.nix
index 00a5458c0882..8b43215c52dc 100644
--- a/pkgs/by-name/th/thcrap-steam-proton-wrapper/package.nix
+++ b/pkgs/by-name/th/thcrap-steam-proton-wrapper/package.nix
@@ -5,7 +5,7 @@
, makeWrapper
, bash
, subversion
- , gnome
+ , zenity
}:
stdenv.mkDerivation {
pname = "thcrap-proton";
@@ -37,7 +37,7 @@ stdenv.mkDerivation {
lib.makeBinPath [
bash
subversion
- gnome.zenity
+ zenity
]
}
'';
diff --git a/pkgs/by-name/tr/trigger-control/package.nix b/pkgs/by-name/tr/trigger-control/package.nix
index b0a389e29ec4..3398a3fe0aab 100644
--- a/pkgs/by-name/tr/trigger-control/package.nix
+++ b/pkgs/by-name/tr/trigger-control/package.nix
@@ -10,13 +10,9 @@
, libdecor
, libnotify
, dejavu_fonts
-, gnome
+, zenity
}:
-let
- inherit (gnome) zenity;
-in
-
stdenv.mkDerivation (finalAttrs: {
pname = "trigger-control";
version = "1.5.1";
diff --git a/pkgs/by-name/wi/wifi-qr/package.nix b/pkgs/by-name/wi/wifi-qr/package.nix
index 341077edaefa..3c5a37b071b8 100644
--- a/pkgs/by-name/wi/wifi-qr/package.nix
+++ b/