diff options
Diffstat (limited to 'pkgs/applications/audio')
-rw-r--r-- | pkgs/applications/audio/bespokesynth/default.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/audio/easytag/default.nix | 3 | ||||
-rw-r--r-- | pkgs/applications/audio/exaile/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/audio/gpodder/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/audio/guitarix/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/audio/helio-workstation/default.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/audio/pavucontrol/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/audio/pithos/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/audio/plugdata/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/audio/sfizz/default.nix | 8 | ||||
-rw-r--r-- | pkgs/applications/audio/sonata/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/audio/sound-juicer/default.nix | 3 | ||||
-rw-r--r-- | pkgs/applications/audio/spotify/linux.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/audio/touchosc/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/audio/vcv-rack/default.nix | 6 |
15 files changed, 35 insertions, 33 deletions
diff --git a/pkgs/applications/audio/bespokesynth/default.nix b/pkgs/applications/audio/bespokesynth/default.nix index 752088fcd8222..83c5af0a53fce 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/easytag/default.nix b/pkgs/applications/audio/easytag/default.nix index 35ba2666f0b6b..d90735294d446 100644 --- a/pkgs/applications/audio/easytag/default.nix +++ b/pkgs/applications/audio/easytag/default.nix @@ -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 diff --git a/pkgs/applications/audio/exaile/default.nix b/pkgs/applications/audio/exaile/default.nix index 4f49564898a9a..9d5c69858aef9 100644 --- a/pkgs/applications/audio/exaile/default.nix +++ b/pkgs/applications/audio/exaile/default.nix @@ -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 diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix index 0e6178006ccfc..eff5bd76c9f22 100644 --- a/pkgs/applications/audio/gpodder/default.nix +++ b/pkgs/applications/audio/gpodder/default.nix @@ -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; [ diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix index 71ac598000daf..247a3bb23ecb1 100644 --- a/pkgs/applications/audio/guitarix/default.nix +++ b/pkgs/applications/audio/guitarix/default.nix @@ -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 diff --git a/pkgs/applications/audio/helio-workstation/default.nix b/pkgs/applications/audio/helio-workstation/default.nix index dc4bf6333d384..79f0c61af78e7 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/pavucontrol/default.nix b/pkgs/applications/audio/pavucontrol/default.nix index 019c777cd046c..f6b8d20f91d2c 100644 --- a/pkgs/applications/audio/pavucontrol/default.nix +++ b/pkgs/applications/audio/pavucontrol/default.nix @@ -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 ]; diff --git a/pkgs/applications/audio/pithos/default.nix b/pkgs/applications/audio/pithos/default.nix index dbb3a63fce6b7..933d173614593 100644 --- a/pkgs/applications/audio/pithos/default.nix +++ b/pkgs/applications/audio/pithos/default.nix @@ -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 ]); diff --git a/pkgs/applications/audio/plugdata/default.nix b/pkgs/applications/audio/plugdata/default.nix index 9af5c4a9fa85f..e58e5aabcd81a 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 c6a0ac824566f..3aa2b6cf6deb8 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/sonata/default.nix b/pkgs/applications/audio/sonata/default.nix index 8b6b9631a85d0..36c0f9239973b 100644 --- a/pkgs/applications/audio/sonata/default.nix +++ b/pkgs/applications/audio/sonata/default.nix @@ -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 diff --git a/pkgs/applications/audio/sound-juicer/default.nix b/pkgs/applications/audio/sound-juicer/default.nix index ef299ac7074cf..a2e2c4bc09ef7 100644 --- a/pkgs/applications/audio/sound-juicer/default.nix +++ b/pkgs/applications/audio/sound-juicer/default.nix @@ -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 diff --git a/pkgs/applications/audio/spotify/linux.nix b/pkgs/applications/audio/spotify/linux.nix index 8886e851c3c95..43b4ae243540e 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 038ff1e2d37da..b3cc4dbd22097 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 7a1ded3e2f82a..0d02e5a686a12 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 |