mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-24 16:03:23 +00:00
zenity: Move from gnome scope to top-level
It is widely used outside gnome, not much inside.
This commit is contained in:
Jan Tojnar
parent
2adc7d7340
commit
b69ed4249d
@ -132,7 +132,7 @@ in {
|
||||
gnome-menus
|
||||
|
||||
# Required by Budgie Control Center.
|
||||
gnome.zenity
|
||||
zenity
|
||||
|
||||
# Provides `gsettings`.
|
||||
glib
|
||||
|
||||
@ -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):
|
||||
|
||||
@ -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 ]))
|
||||
]}'
|
||||
'';
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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" ];
|
||||
|
||||
@ -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
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
, libXrender
|
||||
, libXxf86vm
|
||||
, libglvnd
|
||||
, gnome
|
||||
, zenity
|
||||
}:
|
||||
|
||||
let
|
||||
@ -39,7 +39,7 @@ let
|
||||
];
|
||||
|
||||
runBinDeps = [
|
||||
gnome.zenity
|
||||
zenity
|
||||
];
|
||||
in
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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 ]}
|
||||
'';
|
||||
|
||||
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
, libXrender
|
||||
, libXxf86vm
|
||||
, libglvnd
|
||||
, gnome
|
||||
, zenity
|
||||
}:
|
||||
|
||||
let
|
||||
@ -39,7 +39,7 @@ let
|
||||
];
|
||||
|
||||
runBinDeps = [
|
||||
gnome.zenity
|
||||
zenity
|
||||
];
|
||||
in
|
||||
|
||||
|
||||
@ -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";
|
||||
|
||||
@ -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 = {
|
||||
|
||||
@ -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
|
||||
|
||||
@ -21,8 +21,7 @@
|
||||
, libjpeg8
|
||||
, curl
|
||||
, vulkan-loader
|
||||
, gnome
|
||||
, zenity ? gnome.zenity
|
||||
, zenity
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
|
||||
@ -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}";
|
||||
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
, gtksourceview3
|
||||
, libappindicator-gtk3
|
||||
, libnotify
|
||||
, gnome
|
||||
, zenity
|
||||
, wmctrl
|
||||
}:
|
||||
|
||||
@ -41,7 +41,7 @@ python3Packages.buildPythonApplication rec {
|
||||
];
|
||||
|
||||
runtimeDeps = [
|
||||
gnome.zenity
|
||||
zenity
|
||||
wmctrl
|
||||
];
|
||||
|
||||
|
||||
@ -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;
|
||||
};
|
||||
|
||||
@ -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 ]}
|
||||
)
|
||||
'';
|
||||
|
||||
|
||||
@ -74,7 +74,7 @@ rec {
|
||||
targetPkgs = pkgs: with pkgs; [
|
||||
gtk3
|
||||
bashInteractive
|
||||
gnome.zenity
|
||||
zenity
|
||||
xorg.xrandr
|
||||
which
|
||||
perl
|
||||
|
||||
@ -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 = [
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
]
|
||||
}
|
||||
'';
|
||||
|
||||
@ -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";
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
, fetchFromGitHub
|
||||
, installShellFiles
|
||||
, makeWrapper
|
||||
, gnome
|
||||
, zenity
|
||||
, ncurses
|
||||
, networkmanager
|
||||
, patsh
|
||||
@ -26,7 +26,7 @@ stdenvNoCC.mkDerivation {
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
gnome.zenity
|
||||
zenity
|
||||
ncurses
|
||||
networkmanager
|
||||
procps
|
||||
|
||||
@ -42,7 +42,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
passthru = {
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = "zenity";
|
||||
attrPath = "gnome.zenity";
|
||||
};
|
||||
};
|
||||
|
||||
@ -33,6 +33,7 @@
|
||||
, vala
|
||||
, xfce
|
||||
, wrapGAppsHook3
|
||||
, zenity
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
@ -70,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
gnome-desktop
|
||||
gnome.gnome-settings-daemon
|
||||
gnome.mutter
|
||||
gnome.zenity
|
||||
zenity
|
||||
graphene
|
||||
gst_all_1.gstreamer
|
||||
gst_all_1.gst-plugins-base
|
||||
|
||||
@ -8,7 +8,6 @@
|
||||
, desktop-file-utils
|
||||
, egl-wayland
|
||||
, glib
|
||||
, gnome
|
||||
, gobject-introspection
|
||||
, graphene
|
||||
, gtk3
|
||||
@ -36,6 +35,7 @@
|
||||
, wrapGAppsHook3
|
||||
, xorgserver
|
||||
, xwayland
|
||||
, zenity
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
|
||||
patches = [
|
||||
(substituteAll {
|
||||
src = ./fix-paths.patch;
|
||||
zenity = gnome.zenity;
|
||||
inherit zenity;
|
||||
})
|
||||
];
|
||||
|
||||
|
||||
@ -118,9 +118,6 @@ in
|
||||
|
||||
yelp-xsl = callPackage ./core/yelp-xsl { };
|
||||
|
||||
zenity = callPackage ./core/zenity { };
|
||||
|
||||
|
||||
#### Apps (http://ftp.acc.umu.se/pub/GNOME/apps/)
|
||||
|
||||
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.
|
||||
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.
|
||||
zenity = lib.warn "The ‘gnome.zenity’ was moved to top-level. Please use ‘pkgs.zenity’ directly." pkgs.zenity; # Added on 2024-06-22.
|
||||
|
||||
#### Removals
|
||||
anjuta = throw "`anjuta` was removed after not being maintained upstream and losing control of its official domain."; # 2024-01-16
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
, libXpresent
|
||||
, libXres
|
||||
, libstartup_notification
|
||||
, gnome
|
||||
, zenity
|
||||
, glib
|
||||
, gtk3
|
||||
, mate-desktop
|
||||
@ -45,14 +45,14 @@ stdenv.mkDerivation rec {
|
||||
libXres
|
||||
libstartup_notification
|
||||
gtk3
|
||||
gnome.zenity
|
||||
zenity
|
||||
mate-desktop
|
||||
mate-settings-daemon
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
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";
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
, xfce4-panel
|
||||
, xfconf
|
||||
, curl
|
||||
, gnome
|
||||
, zenity
|
||||
, jq
|
||||
, xclip
|
||||
}:
|
||||
@ -54,7 +54,7 @@ mkXfceDerivation {
|
||||
# For Imgur upload action
|
||||
# https://gitlab.xfce.org/apps/xfce4-screenshooter/-/merge_requests/51
|
||||
gappsWrapperArgs+=(
|
||||
--prefix PATH : ${lib.makeBinPath [ curl gnome.zenity jq xclip ]}
|
||||
--prefix PATH : ${lib.makeBinPath [ curl zenity jq xclip ]}
|
||||
)
|
||||
'';
|
||||
|
||||
|
||||
@ -20,7 +20,7 @@ buildFHSEnv {
|
||||
gamemode
|
||||
curl
|
||||
gawk
|
||||
gnome.zenity
|
||||
zenity
|
||||
plasma5Packages.kdialog
|
||||
mangohud
|
||||
nettools
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ lib, stdenv, cmake, pkg-config, git, curl, SDL2, xercesc, openal, lua, libvlc
|
||||
, 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
|
||||
}:
|
||||
let
|
||||
@ -13,7 +13,7 @@ let
|
||||
};
|
||||
path-env = buildEnv {
|
||||
name = "megaglest-path-env";
|
||||
paths = [ bash which gnome.zenity ];
|
||||
paths = [ bash which zenity ];
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
|
||||
@ -4,6 +4,8 @@
|
||||
{ lib, makeSetupHook, curl, unzip, dos2unix, pkg-config, makeWrapper
|
||||
, lua, mono, python3
|
||||
, 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
|
||||
}:
|
||||
|
||||
|
||||
@ -24,9 +24,6 @@ let
|
||||
fArgs = lib.functionArgs f;
|
||||
in f (builtins.intersectAttrs fArgs pkgs // {
|
||||
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,
|
||||
|
||||
@ -13,9 +13,6 @@ let
|
||||
*/
|
||||
common = let f = import ./common.nix; in f (builtins.intersectAttrs (builtins.functionArgs f) pkgs // {
|
||||
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,
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
, libpulseaudio
|
||||
, libpng
|
||||
, imagemagick
|
||||
, gnome
|
||||
, zenity
|
||||
, makeWrapper
|
||||
, darwin
|
||||
, libicns
|
||||
@ -84,7 +84,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
libXi
|
||||
libXext
|
||||
libpulseaudio
|
||||
gnome.zenity
|
||||
zenity
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
IOSurface
|
||||
Metal
|
||||
@ -168,7 +168,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
'';
|
||||
|
||||
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 = [
|
||||
|
||||
@ -83,7 +83,7 @@ in buildFHSEnv rec {
|
||||
targetPkgs = pkgs: with pkgs; [
|
||||
steam
|
||||
# License agreement
|
||||
gnome.zenity
|
||||
zenity
|
||||
] ++ commonTargetPkgs pkgs;
|
||||
|
||||
multiPkgs = pkgs: with pkgs; [
|
||||
|
||||
@ -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 {
|
||||
pname = "kodi-cli";
|
||||
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
||||
cp -a kodi-cli $out/bin
|
||||
wrapProgram $out/bin/kodi-cli --prefix PATH : ${lib.makeBinPath [ curl bash ]}
|
||||
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; {
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
, fetchFromGitHub
|
||||
, slurp
|
||||
, grim
|
||||
, gnome
|
||||
, zenity
|
||||
, wl-clipboard
|
||||
, imagemagick
|
||||
, makeWrapper
|
||||
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
|
||||
--replace 'grim' "${grim}/bin/grim" \
|
||||
--replace 'slurp' "${slurp}/bin/slurp" \
|
||||
--replace 'convert' "${imagemagick}/bin/convert" \
|
||||
--replace 'zenity' "${gnome.zenity}/bin/zenity" \
|
||||
--replace 'zenity' "${zenity}/bin/zenity" \
|
||||
--replace 'wl-copy' "${wl-clipboard}/bin/wl-copy"
|
||||
'';
|
||||
|
||||
@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
|
||||
grim
|
||||
slurp
|
||||
imagemagick
|
||||
gnome.zenity
|
||||
zenity
|
||||
wl-clipboard
|
||||
]}
|
||||
mkdir -p $out/bin
|
||||
|
||||
@ -1641,7 +1641,6 @@ with pkgs;
|
||||
aj-snapshot = callPackage ../applications/audio/aj-snapshot { };
|
||||
|
||||
ajour = callPackage ../tools/games/ajour {
|
||||
inherit (gnome) zenity;
|
||||
inherit (plasma5Packages) kdialog;
|
||||
};
|
||||
|
||||
@ -2774,9 +2773,7 @@ with pkgs;
|
||||
|
||||
vice = callPackage ../applications/emulators/vice { };
|
||||
|
||||
winetricks = callPackage ../applications/emulators/wine/winetricks.nix {
|
||||
inherit (gnome) zenity;
|
||||
};
|
||||
winetricks = callPackage ../applications/emulators/wine/winetricks.nix { };
|
||||
|
||||
xcpc = callPackage ../applications/emulators/xcpc { };
|
||||
|
||||
@ -32480,9 +32477,7 @@ with pkgs;
|
||||
|
||||
merkaartor = libsForQt5.callPackage ../applications/misc/merkaartor { };
|
||||
|
||||
mepo = callPackage ../applications/misc/mepo {
|
||||
inherit (gnome) zenity;
|
||||
};
|
||||
mepo = callPackage ../applications/misc/mepo { };
|
||||
|
||||
meshcentral = callPackage ../tools/admin/meshcentral { };
|
||||
|
||||
@ -33952,9 +33947,7 @@ with pkgs;
|
||||
|
||||
rusty-psn-gui = rusty-psn.override { withGui = true; };
|
||||
|
||||
rymcast = callPackage ../applications/audio/rymcast {
|
||||
inherit (gnome) zenity;
|
||||
};
|
||||
rymcast = callPackage ../applications/audio/rymcast { };
|
||||
|
||||
rymdport = callPackage ../applications/networking/rymdport {
|
||||
inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
|
||||
@ -34332,7 +34325,6 @@ with pkgs;
|
||||
surf = callPackage ../applications/networking/browsers/surf { gtk = gtk2; };
|
||||
|
||||
surge = callPackage ../applications/audio/surge {
|
||||
inherit (gnome) zenity;
|
||||
git = gitMinimal;
|
||||
};
|
||||
|
||||
@ -35698,7 +35690,6 @@ with pkgs;
|
||||
|
||||
alfis = callPackage ../applications/blockchains/alfis {
|
||||
inherit (darwin.apple_sdk.frameworks) Cocoa Security WebKit;
|
||||
inherit (gnome) zenity;
|
||||
};
|
||||
alfis-nogui = alfis.override {
|
||||
withGui = false;
|
||||
|
||||
@ -173,7 +173,7 @@ rec {
|
||||
}) {};
|
||||
|
||||
nfd = callPackage ../development/lua-modules/nfd {
|
||||
inherit (pkgs.gnome) zenity;
|
||||
inherit (pkgs) zenity;
|
||||
inherit (pkgs.darwin.apple_sdk.frameworks) AppKit;
|
||||
};
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user