diff options
Diffstat (limited to 'pkgs/applications')
505 files changed, 1315 insertions, 1601 deletions
diff --git a/pkgs/applications/accessibility/dasher/default.nix b/pkgs/applications/accessibility/dasher/default.nix index 0de562c5331bb..6e602dc35c331 100644 --- a/pkgs/applications/accessibility/dasher/default.nix +++ b/pkgs/applications/accessibility/dasher/default.nix @@ -3,7 +3,7 @@ , fetchFromGitLab , autoreconfHook , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , glib , gtk3 , expat @@ -39,7 +39,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoreconfHook - wrapGAppsHook + wrapGAppsHook3 pkg-config # doc generation gnome-doc-utils diff --git a/pkgs/applications/accessibility/mousetweaks/default.nix b/pkgs/applications/accessibility/mousetweaks/default.nix index 5426f2c8fdd08..c05c1dd8bf1d8 100644 --- a/pkgs/applications/accessibility/mousetweaks/default.nix +++ b/pkgs/applications/accessibility/mousetweaks/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config -, glib, gtk3, gnome, gsettings-desktop-schemas, wrapGAppsHook +, glib, gtk3, gnome, gsettings-desktop-schemas, wrapGAppsHook3 , xorg }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "005fhmvb45sa9mq17dpa23n1xnspiissx5rnpiy7hiqmy3g5rg8f"; }; - nativeBuildInputs = [ pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook3 ]; buildInputs = [ glib gtk3 gsettings-desktop-schemas diff --git a/pkgs/applications/accessibility/squeekboard/default.nix b/pkgs/applications/accessibility/squeekboard/default.nix index c7ea8b34a66f6..119217ddfd8c5 100644 --- a/pkgs/applications/accessibility/squeekboard/default.nix +++ b/pkgs/applications/accessibility/squeekboard/default.nix @@ -17,7 +17,7 @@ , rustPlatform , rustc , feedbackd -, wrapGAppsHook +, wrapGAppsHook3 , fetchpatch , nixosTests }: @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { pkg-config glib wayland - wrapGAppsHook + wrapGAppsHook3 rustPlatform.cargoSetupHook cargo rustc diff --git a/pkgs/applications/audio/ario/default.nix b/pkgs/applications/audio/ario/default.nix index b9e14f486b7ab..f34ff19ea04ce 100644 --- a/pkgs/applications/audio/ario/default.nix +++ b/pkgs/applications/audio/ario/default.nix @@ -13,7 +13,7 @@ , libsoup , libxml2 , taglib -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { pkg-config gettext intltool - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index c0db59b1d2bbd..365ea7d9c9eb0 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , cmake , makeWrapper -, wrapGAppsHook +, wrapGAppsHook3 , pkg-config , python3 , gettext @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { pkg-config python3 makeWrapper - wrapGAppsHook + wrapGAppsHook3 ] ++ lib.optionals stdenv.isLinux [ linuxHeaders ]; diff --git a/pkgs/applications/audio/audio-recorder/default.nix b/pkgs/applications/audio/audio-recorder/default.nix index 72d31e2966ff5..ebf9eafcb0d3f 100644 --- a/pkgs/applications/audio/audio-recorder/default.nix +++ b/pkgs/applications/audio/audio-recorder/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl , pkg-config, intltool , glib, dbus, gtk3, libappindicator-gtk3, gst_all_1 -, librsvg, wrapGAppsHook +, librsvg, wrapGAppsHook3 , pulseaudioSupport ? true, libpulseaudio }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { # https://bugs.launchpad.net/audio-recorder/+bug/1784622 env.NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; - nativeBuildInputs = [ pkg-config intltool wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config intltool wrapGAppsHook3 ]; buildInputs = [ glib dbus gtk3 librsvg libappindicator-gtk3 diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix index 5f750a885d155..8eda6c204b7f8 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix @@ -2,7 +2,7 @@ , gdk-pixbuf, glib, gtk3, lib, xorg , libglvnd, libjack2, ffmpeg , libxkbcommon, xdg-utils, zlib, pulseaudio -, wrapGAppsHook, makeWrapper }: +, wrapGAppsHook3, makeWrapper }: stdenv.mkDerivation rec { pname = "bitwig-studio"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-cF8gVPjM0KUcKOW09uFccp4/lzbUmZcBkVOwr/A/8Yw="; }; - nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook ]; + nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook3 ]; unpackCmd = '' mkdir -p root diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix index 9d4da64074616..24d5147327aa5 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix @@ -16,7 +16,7 @@ , makeWrapper , pipewire , pulseaudio -, wrapGAppsHook +, wrapGAppsHook3 , xdg-utils , xorg , zlib @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-gtQ1mhXk0AqGidZk5TCzSR58pD1JJoELMBmELtqyb4U="; }; - nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook ]; + nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook3 ]; unpackCmd = '' mkdir -p root diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix index d6bb4edfabd26..e795128ba944f 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix @@ -19,7 +19,7 @@ , pango , pipewire , pulseaudio -, wrapGAppsHook +, wrapGAppsHook3 , xdg-utils , xorg , zlib @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-KxNLae/uTYL1m/X+/7wr7hhKfw31NpB9Mw9RzfrTuus="; }; - nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook ]; + nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook3 ]; unpackCmd = '' mkdir -p root diff --git a/pkgs/applications/audio/blanket/default.nix b/pkgs/applications/audio/blanket/default.nix deleted file mode 100644 index 4b08f8cf223ae..0000000000000 --- a/pkgs/applications/audio/blanket/default.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ lib -, fetchFromGitHub -, meson -, ninja -, pkg-config -, wrapGAppsHook4 -, desktop-file-utils -, appstream-glib -, python3Packages -, glib -, gtk4 -, libadwaita -, gobject-introspection -, gst_all_1 -}: - -python3Packages.buildPythonApplication rec { - pname = "blanket"; - version = "0.6.0"; - - src = fetchFromGitHub { - owner = "rafaelmardojai"; - repo = "blanket"; - rev = "refs/tags/${version}"; - sha256 = "sha256-4gthT1x76IfXWkLaLMPtFS4TRlRGk5Enbu/k1jAHzwE="; - }; - - nativeBuildInputs = [ - meson - ninja - pkg-config - wrapGAppsHook4 - desktop-file-utils - gobject-introspection - ]; - - buildInputs = [ - glib - gtk4 - libadwaita - gst_all_1.gstreamer - gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-good - gst_all_1.gst-plugins-bad - ]; - - propagatedBuildInputs = with python3Packages; [ - pygobject3 - ]; - - format = "other"; - - postPatch = '' - patchShebangs build-aux/meson/postinstall.py - substituteInPlace build-aux/meson/postinstall.py \ - --replace gtk-update-icon-cache gtk4-update-icon-cache - ''; - - meta = with lib; { - homepage = "https://github.com/rafaelmardojai/blanket"; - description = "Listen to different sounds"; - mainProgram = "blanket"; - maintainers = with maintainers; [ onny ]; - license = licenses.gpl3Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/audio/buzztrax/default.nix b/pkgs/applications/audio/buzztrax/default.nix index 85d8fbed7671f..eee9d4cadbc01 100644 --- a/pkgs/applications/audio/buzztrax/default.nix +++ b/pkgs/applications/audio/buzztrax/default.nix @@ -7,7 +7,7 @@ , itstool , libtool , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , yelp-tools , clutter-gtk , gst_all_1 @@ -41,7 +41,7 @@ stdenv.mkDerivation { itstool libtool pkg-config - wrapGAppsHook + wrapGAppsHook3 yelp-tools ]; diff --git a/pkgs/applications/audio/deadbeef/default.nix b/pkgs/applications/audio/deadbeef/default.nix index f26fd4903726f..d141a61963659 100644 --- a/pkgs/applications/audio/deadbeef/default.nix +++ b/pkgs/applications/audio/deadbeef/default.nix @@ -8,7 +8,7 @@ , swift-corelibs-libdispatch # deadbeef can use either gtk2 or gtk3 , gtk2Support ? false, gtk2 -, gtk3Support ? true, gtk3, gsettings-desktop-schemas, wrapGAppsHook +, gtk3Support ? true, gtk3, gsettings-desktop-schemas, wrapGAppsHook3 # input plugins , vorbisSupport ? true, libvorbis , mp123Support ? true, libmad @@ -112,7 +112,7 @@ in clangStdenv.mkDerivation { libtool pkg-config ] ++ optionals gtk3Support [ - wrapGAppsHook + wrapGAppsHook3 ]; enableParallelBuilding = true; diff --git a/pkgs/applications/audio/denemo/default.nix b/pkgs/applications/audio/denemo/default.nix index ed4460a283226..1a5ce4c77e6e0 100644 --- a/pkgs/applications/audio/denemo/default.nix +++ b/pkgs/applications/audio/denemo/default.nix @@ -3,7 +3,7 @@ , glib, libxml2, librsvg, libsndfile, aubio , gtk3, gtksourceview, evince, fluidsynth, rubberband , autoreconfHook, gtk-doc -, portaudio, portmidi, fftw, wrapGAppsHook }: +, portaudio, portmidi, fftw, wrapGAppsHook3 }: stdenv.mkDerivation rec { pname = "denemo"; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook gtk-doc - wrapGAppsHook + wrapGAppsHook3 intltool gettext pkg-config diff --git a/pkgs/applications/audio/easyabc/default.nix b/pkgs/applications/audio/easyabc/default.nix index 9fb792626ac2c..bdc753d0f45e0 100644 --- a/pkgs/applications/audio/easyabc/default.nix +++ b/pkgs/applications/audio/easyabc/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, fetchPypi, substituteAll, python39, fluidsynth, soundfont-fluid, wrapGAppsHook, abcmidi, abcm2ps, ghostscript }: +{ lib, fetchFromGitHub, fetchPypi, substituteAll, python39, fluidsynth, soundfont-fluid, wrapGAppsHook3, abcmidi, abcm2ps, ghostscript }: let # requires python39 due to https://stackoverflow.com/a/71902541 https://github.com/jwdj/EasyABC/issues/52 @@ -28,7 +28,7 @@ in python.pkgs.buildPythonApplication { hash = "sha256-leC3A4HQMeJNeZXArb3YAYr2mddGPcws618NrRh2Q1Y="; }; - nativeBuildInputs = [ wrapGAppsHook ]; + nativeBuildInputs = [ wrapGAppsHook3 ]; propagatedBuildInputs = with python.pkgs; [ cx-freeze diff --git a/pkgs/applications/audio/easytag/default.nix b/pkgs/applications/audio/easytag/default.nix index 6366721a35653..34a4ddc64b379 100644 --- a/pkgs/applications/audio/easytag/default.nix +++ b/pkgs/applications/audio/easytag/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, pkg-config, intltool, gtk3, glib, libid3tag, id3lib, taglib , libvorbis, libogg, opusfile, flac, itstool, libxml2, gsettings-desktop-schemas -, gnome, wrapGAppsHook +, gnome, wrapGAppsHook3 }: let @@ -16,7 +16,7 @@ in stdenv.mkDerivation rec { NIX_LDFLAGS = "-lid3tag -lz"; - nativeBuildInputs = [ pkg-config intltool itstool libxml2 wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config intltool itstool libxml2 wrapGAppsHook3 ]; buildInputs = [ gtk3 glib libid3tag id3lib taglib libvorbis libogg opusfile flac gsettings-desktop-schemas gnome.adwaita-icon-theme diff --git a/pkgs/applications/audio/exaile/default.nix b/pkgs/applications/audio/exaile/default.nix index a2f75fd85a705..624f14558142c 100644 --- a/pkgs/applications/audio/exaile/default.nix +++ b/pkgs/applications/audio/exaile/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub -, gobject-introspection, makeWrapper, wrapGAppsHook +, gobject-introspection, makeWrapper, wrapGAppsHook3 , gtk3, gst_all_1, python3 , gettext, gnome, help2man, keybinder3, libnotify, librsvg, streamripper, udisks, webkitgtk , iconTheme ? gnome.adwaita-icon-theme @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gobject-introspection makeWrapper - wrapGAppsHook + wrapGAppsHook3 ] ++ lib.optionals documentationSupport [ help2man python3.pkgs.sphinx diff --git a/pkgs/applications/audio/gmpc/default.nix b/pkgs/applications/audio/gmpc/default.nix index 33930dfb7d2d1..071e900b59b27 100644 --- a/pkgs/applications/audio/gmpc/default.nix +++ b/pkgs/applications/audio/gmpc/default.nix @@ -16,7 +16,7 @@ , libICE , sqlite , hicolor-icon-theme -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { sha256 = "0b3bnxf98i5lhjyljvgxgx9xmb6p46cn3a9cccrng14nagri9556"; }; - nativeBuildInputs = [ pkg-config libtool intltool gob2 vala wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config libtool intltool gob2 vala wrapGAppsHook3 ]; buildInputs = [ glib gtk2 diff --git a/pkgs/applications/audio/goodvibes/default.nix b/pkgs/applications/audio/goodvibes/default.nix index 111cad65a013d..d2eb394e59b3d 100644 --- a/pkgs/applications/audio/goodvibes/default.nix +++ b/pkgs/applications/audio/goodvibes/default.nix @@ -10,7 +10,7 @@ , libsoup , keybinder3 , gst_all_1 -, wrapGAppsHook +, wrapGAppsHook3 , appstream-glib , desktop-file-utils }: @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meson ninja pkg-config - wrapGAppsHook + wrapGAppsHook3 appstream-glib desktop-file-utils ]; diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix index 80f12aa2d0dc7..cde01e65bdeed 100644 --- a/pkgs/applications/audio/gpodder/default.nix +++ b/pkgs/applications/audio/gpodder/default.nix @@ -8,7 +8,7 @@ , intltool , python3 , python3Packages -, wrapGAppsHook +, wrapGAppsHook3 , xdg-utils }: @@ -34,7 +34,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ intltool - wrapGAppsHook + wrapGAppsHook3 glibcLocales gobject-introspection ]; diff --git a/pkgs/applications/audio/gspeech/default.nix b/pkgs/applications/audio/gspeech/default.nix index f2216ed7d2560..86a93c78962de 100644 --- a/pkgs/applications/audio/gspeech/default.nix +++ b/pkgs/applications/audio/gspeech/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , python3 , gtk3 -, wrapGAppsHook +, wrapGAppsHook3 , glibcLocales , gobject-introspection , gettext @@ -30,7 +30,7 @@ python3.pkgs.buildPythonApplication rec { }; nativeBuildInputs = [ - wrapGAppsHook + wrapGAppsHook3 gobject-introspection pango gdk-pixbuf diff --git a/pkgs/applications/audio/gst123/default.nix b/pkgs/applications/audio/gst123/default.nix index 37b343f540b41..65d925342be2c 100644 --- a/pkgs/applications/audio/gst123/default.nix +++ b/pkgs/applications/audio/gst123/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , autoreconfHook , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , gst_all_1 , gtk3 , ncurses @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ autoreconfHook pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix index c1d1cf5571c50..50c00101dc210 100644 --- a/pkgs/applications/audio/guitarix/default.nix +++ b/pkgs/applications/audio/guitarix/default.nix @@ -31,7 +31,7 @@ , sord , sratom , wafHook -, wrapGAppsHook +, wrapGAppsHook3 , zita-convolver , zita-resampler , optimizationSupport ? false # Enable support for native CPU extensions @@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: { pkg-config python3 wafHook - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/audio/hivelytracker/default.nix b/pkgs/applications/audio/hivelytracker/default.nix index 324d0ca362b4c..8ad62eb81a5a4 100644 --- a/pkgs/applications/audio/hivelytracker/default.nix +++ b/pkgs/applications/audio/hivelytracker/default.nix @@ -6,7 +6,7 @@ , SDL_image , SDL_ttf , gtk3 -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation (finalAttrs: { @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/audio/hushboard/default.nix b/pkgs/applications/audio/hushboard/default.nix index 3248ab35b22cb..dbc0a467024cb 100644 --- a/pkgs/applications/audio/hushboard/default.nix +++ b/pkgs/applications/audio/hushboard/default.nix @@ -9,7 +9,7 @@ , pycairo , pygobject3 , six -, wrapGAppsHook +, wrapGAppsHook3 , xlib }: @@ -25,7 +25,7 @@ buildPythonApplication { }; nativeBuildInputs = [ - wrapGAppsHook + wrapGAppsHook3 gobject-introspection ]; diff --git a/pkgs/applications/audio/indicator-sound-switcher/default.nix b/pkgs/applications/audio/indicator-sound-switcher/default.nix index c47aff47fffe5..1a99287348276 100644 --- a/pkgs/applications/audio/indicator-sound-switcher/default.nix +++ b/pkgs/applications/audio/indicator-sound-switcher/default.nix @@ -5,7 +5,7 @@ , gettext , gtk3 , gobject-introspection -, intltool, wrapGAppsHook, glib +, intltool, wrapGAppsHook3, glib , librsvg , libayatana-appindicator , libpulseaudio @@ -32,7 +32,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ gettext intltool - wrapGAppsHook + wrapGAppsHook3 glib gdk-pixbuf ]; diff --git a/pkgs/applications/audio/lingot/default.nix b/pkgs/applications/audio/lingot/default.nix index 3d7339f571d65..4cc31ae421549 100644 --- a/pkgs/applications/audio/lingot/default.nix +++ b/pkgs/applications/audio/lingot/default.nix @@ -3,7 +3,7 @@ , fetchurl , pkg-config , intltool -, wrapGAppsHook +, wrapGAppsHook3 , gtk3 , alsa-lib , libpulseaudio @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config intltool - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix index 3fb5e7efa7981..129c90745e814 100644 --- a/pkgs/applications/audio/lollypop/default.nix +++ b/pkgs/applications/audio/lollypop/default.nix @@ -18,7 +18,7 @@ , gdk-pixbuf , glib , pango -, wrapGAppsHook +, wrapGAppsHook3 , lastFMSupport ? true , youtubeSupport ? true }: @@ -45,7 +45,7 @@ python3.pkgs.buildPythonApplication rec { meson ninja pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = with gst_all_1; [ diff --git a/pkgs/applications/audio/lyrebird/default.nix b/pkgs/applications/audio/lyrebird/default.nix index 5eb2d745cdc32..be12c55596509 100644 --- a/pkgs/applications/audio/lyrebird/default.nix +++ b/pkgs/applications/audio/lyrebird/default.nix @@ -2,7 +2,7 @@ , lib , fetchFromGitHub , makeDesktopItem -, wrapGAppsHook +, wrapGAppsHook3 , gtk3 , gobject-introspection , sox @@ -34,7 +34,7 @@ python3Packages.buildPythonApplication rec { propagatedBuildInputs = with python3Packages; [ toml pygobject3 ]; - nativeBuildInputs = [ wrapGAppsHook gobject-introspection ]; + nativeBuildInputs = [ wrapGAppsHook3 gobject-introspection ]; buildInputs = [ gtk3 sox ]; diff --git a/pkgs/applications/audio/mpdevil/default.nix b/pkgs/applications/audio/mpdevil/default.nix index 9dff169594471..3ca2a0e661526 100644 --- a/pkgs/applications/audio/mpdevil/default.nix +++ b/pkgs/applications/audio/mpdevil/default.nix @@ -3,7 +3,7 @@ , python3Packages , gdk-pixbuf, glib, gobject-introspection, gtk3 , libnotify -, wrapGAppsHook }: +, wrapGAppsHook3 }: python3Packages.buildPythonApplication rec { pname = "mpdevil"; @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { format = "other"; nativeBuildInputs = [ - glib.dev gobject-introspection gtk3 pkg-config meson ninja wrapGAppsHook + glib.dev gobject-introspection gtk3 pkg-config meson ninja wrapGAppsHook3 ]; buildInputs = [ @@ -40,7 +40,7 @@ python3Packages.buildPythonApplication rec { # Prevent double wrapping. dontWrapGApps = true; - # Otherwise wrapGAppsHook do not pick up the dependencies correctly. + # Otherwise wrapGAppsHook3 do not pick up the dependencies correctly. strictDeps = false; # There aren't any checks. doCheck = false; diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix index 707ec5c8ebfe8..37d713b5e5341 100644 --- a/pkgs/applications/audio/musescore/default.nix +++ b/pkgs/applications/audio/musescore/default.nix @@ -84,11 +84,6 @@ in stdenv'.mkDerivation (finalAttrs: { "--set-default QT_QPA_PLATFORM xcb" ]; - # HACK `propagatedSandboxProfile` does not appear to actually propagate the - # sandbox profile from `qtbase`, see: - # https://github.com/NixOS/nixpkgs/issues/237458 - sandboxProfile = toString qtbase.__propagatedSandboxProfile or null; - nativeBuildInputs = [ wrapQtAppsHook cmake diff --git a/pkgs/applications/audio/muso/default.nix b/pkgs/applications/audio/muso/default.nix index 30b26e7e59796..217ff8afef8af 100644 --- a/pkgs/applications/audio/muso/default.nix +++ b/pkgs/applications/audio/muso/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, rustPlatform -, pkg-config, wrapGAppsHook, CoreServices +, pkg-config, wrapGAppsHook3, CoreServices }: rustPlatform.buildRustPackage rec { @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { hash = "sha256-09DWUER0ZWQuwfE3sjov2GjJNI7coE3D3E5iUy9mlSE="; }; - nativeBuildInputs = [ pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook3 ]; buildInputs = lib.optional stdenv.isDarwin CoreServices; preConfigure = '' diff --git a/pkgs/applications/audio/opustags/default.nix b/pkgs/applications/audio/opustags/default.nix index 314d475a04ede..7978e4864ac45 100644 --- a/pkgs/applications/audio/opustags/default.nix +++ b/pkgs/applications/audio/opustags/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "opustags"; - version = "1.9.0"; + version = "1.10.0"; src = fetchFromGitHub { owner = "fmang"; repo = "opustags"; rev = version; - sha256 = "sha256-cRDyE6/nv8g0OWxZ/AqfwVrk3cSIycvbjvQm9CyQK7g="; + sha256 = "sha256-2t6fhA1s1sKpHTmaMtK+DZ8xLpS6ntq33b4ycuMc8x8="; }; diff --git a/pkgs/applications/audio/paprefs/default.nix b/pkgs/applications/audio/paprefs/default.nix index 212d866059da1..fa28433fe9cd3 100644 --- a/pkgs/applications/audio/paprefs/default.nix +++ b/pkgs/applications/audio/paprefs/default.nix @@ -8,7 +8,7 @@ , pulseaudioFull , glibmm , gtkmm3 -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ninja gettext pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/audio/pavucontrol/default.nix b/pkgs/applications/audio/pavucontrol/default.nix index 00aed303666eb..019c777cd046c 100644 --- a/pkgs/applications/audio/pavucontrol/default.nix +++ b/pkgs/applications/audio/pavucontrol/default.nix @@ -9,7 +9,7 @@ , libcanberra-gtk3 , json-glib , gnome -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { gnome.adwaita-icon-theme ]; - nativeBuildInputs = [ pkg-config intltool wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config intltool wrapGAppsHook3 ]; configureFlags = [ "--disable-lynx" ]; diff --git a/pkgs/applications/audio/pithos/default.nix b/pkgs/applications/audio/pithos/default.nix index 1ff4aedb6b00f..dbb3a63fce6b7 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 -, wrapGAppsHook, pythonPackages, gtk3, gnome, gobject-introspection +, wrapGAppsHook3, pythonPackages, gtk3, gnome, gobject-introspection , libnotify, libsecret, gst_all_1 }: pythonPackages.buildPythonApplication rec { @@ -20,7 +20,7 @@ pythonPackages.buildPythonApplication rec { patchShebangs meson_post_install.py ''; - nativeBuildInputs = [ meson ninja pkg-config appstream-glib wrapGAppsHook ]; + nativeBuildInputs = [ meson ninja pkg-config appstream-glib wrapGAppsHook3 ]; propagatedNativeBuildInputs = [ gobject-introspection diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix index 6ea7b2f885368..797e9bd0e5f1b 100644 --- a/pkgs/applications/audio/praat/default.nix +++ b/pkgs/applications/audio/praat/default.nix @@ -6,7 +6,7 @@ , libpulseaudio , pkg-config , stdenv -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation (finalAttrs: { @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/audio/pulseeffects-legacy/default.nix b/pkgs/applications/audio/pulseeffects-legacy/default.nix index c243b99f098c7..1fb71e05d2f20 100644 --- a/pkgs/applications/audio/pulseeffects-legacy/default.nix +++ b/pkgs/applications/audio/pulseeffects-legacy/default.nix @@ -7,7 +7,7 @@ , python3 , libxml2 , desktop-file-utils -, wrapGAppsHook +, wrapGAppsHook3 , gst_all_1 , pulseaudio , gtk3 @@ -62,7 +62,7 @@ in stdenv.mkDerivation rec { itstool python3 desktop-file-utils - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix index f7baad9c53a07..66d74efdcfd7a 100644 --- a/pkgs/applications/audio/quodlibet/default.nix +++ b/pkgs/applications/audio/quodlibet/default.nix @@ -5,7 +5,7 @@ # build time , gettext , gobject-introspection -, wrapGAppsHook +, wrapGAppsHook3 # runtime , adwaita-icon-theme @@ -62,7 +62,7 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = [ gettext gobject-introspection - wrapGAppsHook + wrapGAppsHook3 ] ++ (with python3.pkgs; [ sphinx-rtd-theme sphinxHook diff --git a/pkgs/applications/audio/radiotray-ng/default.nix b/pkgs/applications/audio/radiotray-ng/default.nix index 56c316dadcdb4..c67f3f4c56c0c 100644 --- a/pkgs/applications/audio/radiotray-ng/default.nix +++ b/pkgs/applications/audio/radiotray-ng/default.nix @@ -26,7 +26,7 @@ # Testing , gtest # Fixup -, wrapGAppsHook +, wrapGAppsHook3 , makeWrapper }: @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-/0GlQdSsIPKGrDT9CgxvaH8TpAbqxFduwL2A2+BSrEI="; }; - nativeBuildInputs = [ cmake pkg-config wrapGAppsHook makeWrapper ]; + nativeBuildInputs = [ cmake pkg-config wrapGAppsHook3 makeWrapper ]; buildInputs = [ curl diff --git a/pkgs/applications/audio/rhythmbox/default.nix b/pkgs/applications/audio/rhythmbox/default.nix index c14638912af21..0ef2bd5a6c40e 100644 --- a/pkgs/applications/audio/rhythmbox/default.nix +++ b/pkgs/applications/audio/rhythmbox/default.nix @@ -27,7 +27,7 @@ , tdb , json-glib , itstool -, wrapGAppsHook +, wrapGAppsHook3 , desktop-file-utils , gst_all_1 , gst_plugins ? with gst_all_1; [ gst-plugins-good gst-plugins-ugly ] @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { vala glib itstool - wrapGAppsHook + wrapGAppsHook3 desktop-file-utils gobject-introspection ]; diff --git a/pkgs/applications/audio/sfxr/default.nix b/pkgs/applications/audio/sfxr/default.nix index 552bc8ea52a56..6f148fae25244 100644 --- a/pkgs/applications/audio/sfxr/default.nix +++ b/pkgs/applications/audio/sfxr/default.nix @@ -6,7 +6,7 @@ , SDL , gtk3 , gsettings-desktop-schemas -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation (finalAttrs: { @@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { SDL gtk3 gsettings-desktop-schemas - wrapGAppsHook + wrapGAppsHook3 ]; makeFlags = [ "DESTDIR=$(out)" ]; diff --git a/pkgs/applications/audio/sonata/default.nix b/pkgs/applications/audio/sonata/default.nix index 97397da96f259..b0093a8093da7 100644 --- a/pkgs/applications/audio/sonata/default.nix +++ b/pkgs/applications/audio/sonata/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, wrapGAppsHook, gettext +{ lib, fetchFromGitHub, wrapGAppsHook3, gettext , python3Packages, gnome, gtk3, glib, gdk-pixbuf, gsettings-desktop-schemas, gobject-introspection }: let @@ -19,7 +19,7 @@ in buildPythonApplication rec { nativeBuildInputs = [ gettext gobject-introspection - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/audio/sound-juicer/default.nix b/pkgs/applications/audio/sound-juicer/default.nix index 65a12c423b3f3..88e7a314c822e 100644 --- a/pkgs/applications/audio/sound-juicer/default.nix +++ b/pkgs/applications/audio/sound-juicer/default.nix @@ -16,7 +16,7 @@ , libdiscid , isocodes , gsettings-desktop-schemas -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { pkg-config itstool libxml2 - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/audio/soundconverter/default.nix b/pkgs/applications/audio/soundconverter/default.nix index b07ed63f220df..27238e36d088c 100644 --- a/pkgs/applications/audio/soundconverter/default.nix +++ b/pkgs/applications/audio/soundconverter/default.nix @@ -1,7 +1,7 @@ { lib, fetchurl # Optional due to unfree license. , faacSupport ? false -, glib, python3Packages, gtk3, wrapGAppsHook +, glib, python3Packages, gtk3, wrapGAppsHook3 , gsettings-desktop-schemas, intltool, xvfb-run , gobject-introspection, gst_all_1, fdk-aac-encoder }: @@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ intltool - wrapGAppsHook + wrapGAppsHook3 gobject-introspection ]; diff --git a/pkgs/applications/audio/spek/default.nix b/pkgs/applications/audio/spek/default.nix index bd206709c26e5..6bc15adf6082e 100644 --- a/pkgs/applications/audio/spek/default.nix +++ b/pkgs/applications/audio/spek/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, intltool, pkg-config, ffmpeg, wxGTK32, gtk3, wrapGAppsHook }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, intltool, pkg-config, ffmpeg, wxGTK32, gtk3, wrapGAppsHook3 }: stdenv.mkDerivation rec { pname = "spek"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-VYt2so2k3Rk3sLSV1Tf1G2pESYiXygrKr9Koop8ChCg="; }; - nativeBuildInputs = [ autoreconfHook intltool pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ autoreconfHook intltool pkg-config wrapGAppsHook3 ]; buildInputs = [ ffmpeg wxGTK32 gtk3 ]; diff --git a/pkgs/applications/audio/spotify/linux.nix b/pkgs/applications/audio/spotify/linux.nix index 202f8b4ceeec1..88e4e8658a8bd 100644 --- a/pkgs/applications/audio/spotify/linux.nix +++ b/pkgs/applications/audio/spotify/linux.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, squashfsTools, xorg, alsa-lib, makeShellWrapper, wrapGAppsHook, 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 , libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg_4, curlWithGnuTls, zlib, gnome , at-spi2-atk, at-spi2-core, libpulseaudio, libdrm, mesa, libxkbcommon @@ -90,7 +90,7 @@ stdenv.mkDerivation { hash = "sha512-o4iLcbNqbsxo9YJMy0SXO7Udv4CMhhBcsf53UuqWKFFWY/jKVN+Lb+dB7Jf9+UowpmbrP44w97Oi+dnbfFXYjQ=="; }; - nativeBuildInputs = [ wrapGAppsHook makeShellWrapper squashfsTools ]; + nativeBuildInputs = [ wrapGAppsHook3 makeShellWrapper squashfsTools ]; dontStrip = true; dontPatchELF = true; diff --git a/pkgs/applications/audio/sublime-music/default.nix b/pkgs/applications/audio/sublime-music/default.nix index 2ce12df23dcf6..edb572ad1bd68 100644 --- a/pkgs/applications/audio/sublime-music/default.nix +++ b/pkgs/applications/audio/sublime-music/default.nix @@ -4,7 +4,7 @@ , gobject-introspection , gtk3 , pango -, wrapGAppsHook +, wrapGAppsHook3 , xvfb-run , chromecastSupport ? false , serverSupport ? false @@ -57,7 +57,7 @@ python.pkgs.buildPythonApplication rec { nativeBuildInputs = [ python.pkgs.flit-core gobject-introspection - wrapGAppsHook + wrapGAppsHook3 ]; postPatch = '' diff --git a/pkgs/applications/audio/transcribe/default.nix b/pkgs/applications/audio/transcribe/default.nix index 0d311adf8799d..785550a0a040b 100644 --- a/pkgs/applications/audio/transcribe/default.nix +++ b/pkgs/applications/audio/transcribe/default.nix @@ -1,7 +1,7 @@ { stdenv , fetchzip , lib -, wrapGAppsHook +, wrapGAppsHook3 , xdg-utils , which , alsa-lib @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ which xdg-utils - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = with gst_all_1; [ diff --git a/pkgs/applications/audio/tuner/default.nix b/pkgs/applications/audio/tuner/default.nix index 0f4db5af20a6e..8262fa152bde9 100644 --- a/pkgs/applications/audio/tuner/default.nix +++ b/pkgs/applications/audio/tuner/default.nix @@ -7,7 +7,7 @@ , vala , glib , itstool -, wrapGAppsHook +, wrapGAppsHook3 , desktop-file-utils , libsoup , json-glib @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { vala glib itstool - wrapGAppsHook + wrapGAppsHook3 desktop-file-utils ]; diff --git a/pkgs/applications/audio/vcv-rack/default.nix b/pkgs/applications/audio/vcv-rack/default.nix index 8f107ee2cb9c3..7a1ded3e2f82a 100644 --- a/pkgs/applications/audio/vcv-rack/default.nix +++ b/pkgs/applications/audio/vcv-rack/default.nix @@ -24,7 +24,7 @@ , rtmidi , speexdsp , stdenv -, wrapGAppsHook +, wrapGAppsHook3 , zstd }: @@ -183,7 +183,7 @@ stdenv.mkDerivation rec { libicns makeWrapper pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ alsa-lib diff --git a/pkgs/applications/audio/vocal/default.nix b/pkgs/applications/audio/vocal/default.nix index 00f4ac9172ac3..eeea9a73f1e69 100644 --- a/pkgs/applications/audio/vocal/default.nix +++ b/pkgs/applications/audio/vocal/default.nix @@ -21,7 +21,7 @@ , gst_all_1 , json-glib , libgee -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { ninja vala pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = with gst_all_1; [ diff --git a/pkgs/applications/audio/ymuse/default.nix b/pkgs/applications/audio/ymuse/default.nix index 2c8da2f3af44e..19859a1d819d9 100644 --- a/pkgs/applications/audio/ymuse/default.nix +++ b/pkgs/applications/audio/ymuse/default.nix @@ -1,7 +1,7 @@ { lib , fetchFromGitHub , buildGoModule -, wrapGAppsHook +, wrapGAppsHook3 , pkg-config , glib , gobject-introspection @@ -26,7 +26,7 @@ buildGoModule rec { nativeBuildInputs = [ pkg-config - wrapGAppsHook + wrapGAppsHook3 glib gobject-introspection gdk-pixbuf diff --git a/pkgs/applications/audio/zrythm/default.nix b/pkgs/applications/audio/zrythm/default.nix index 663c159d5d9b0..8ec6ba1a040aa 100644 --- a/pkgs/applications/audio/zrythm/default.nix +++ b/pkgs/applications/audio/zrythm/default.nix @@ -1,12 +1,9 @@ { stdenv , lib , fetchFromGitHub -, fetchFromSourcehut -, fetchpatch -, SDL2 +, fetchzip , alsa-lib , appstream -, appstream-glib , bash-completion , boost , breeze-icons @@ -16,7 +13,6 @@ , curl , dbus , dconf -, faust2lv2 , fftw , fftwFloat , flex @@ -27,159 +23,140 @@ , guile , help2man , jq -, json-glib , kissfft , libadwaita -, libaudec , libbacktrace , libcyaml , libepoxy -, libgtop , libjack2 , libpanel , libpulseaudio , libsamplerate -, libsass , libsndfile -, libsoundio , libxml2 , libyaml , lilv , lv2 , meson , ninja -, pandoc -, pcre , pcre2 , pkg-config , python3 -, reproc -, rtaudio +, rtaudio_6 , rtmidi , rubberband , sassc , serd , sord , sox +, soxr , sratom , texi2html , vamp-plugin-sdk , wrapGAppsHook4 +, writeScript , xdg-utils , xxHash +, yyjson , zix , zstd }: let - # As of zrythm-1.0.0-beta.4.5.62, Zrythm needs clap - # https://github.com/falktx/carla/tree/main/source/includes/clap, which is - # only available on Carla unstable as of 2023-02-24. - carla-unstable = carla.overrideAttrs (oldAttrs: rec { + # Error: Dependency carla-host-plugin found: NO found 2.5.6 but need: '>=2.6.0' + # So we need Carla unstable + carla-unstable = carla.overrideAttrs (oldAttrs: { pname = "carla"; - version = "unstable-2023-05-12"; + version = "unstable-2024-04-26"; src = fetchFromGitHub { owner = "falkTX"; - repo = pname; - rev = "0175570f1d41285f39efe0ee32234458e0ed941c"; - hash = "sha256-yfVzZV8G4AUDM8+yS9finzobpOb1PUEPgBWFhEY4nFQ="; + repo = "carla"; + rev = "948991d7b5104280c03960925908e589c77b169a"; + hash = "sha256-uGAuKheoMfP9hZXsw29ec+58dJM8wMuowe95QutzKBY="; }; }); in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "zrythm"; - version = "1.0.0-beta.4.9.1"; + version = "1.0.0-rc.1"; - src = fetchFromSourcehut { - owner = "~alextee"; - repo = pname; - rev = "v${version}"; - hash = "sha256-U3IUqNbHu20uyWfkTsLOOlUZjcUL4QdHilB3srSsebw="; + src = fetchzip { + url = "https://www.zrythm.org/releases/${finalAttrs.pname}-${finalAttrs.version}.tar.xz"; + sha256 = "sha256-Ljbw7bjGI6js4OP9KEXCkhC9AMbInSz0nn+pROm4vXw="; }; + passthru.updateScript = writeScript "update-zrythm" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl common-updater-scripts + + version="$(curl -s https://www.zrythm.org/releases/ | grep -o -m 1 'href="zrythm-[^"]*\.tar\.xz"' | head -1 | sed 's/href="zrythm-\(.*\)\.tar\.xz"/\1/')" + update-source-version zrythm "$version" + ''; + nativeBuildInputs = [ + chromaprint cmake + flex + guile help2man jq - libaudec libxml2 + lilv meson ninja - pandoc pkg-config python3 python3.pkgs.sphinx sassc + serd + sord + sratom texi2html wrapGAppsHook4 ]; buildInputs = [ - SDL2 alsa-lib appstream - appstream-glib bash-completion boost - breeze-icons carla-unstable - chromaprint curl dbus dconf - faust2lv2 fftw fftwFloat - flex glib graphviz gtk4 gtksourceview5 - guile - json-glib kissfft libadwaita libbacktrace libcyaml libepoxy - libgtop libjack2 libpanel libpulseaudio libsamplerate - libsass libsndfile - libsoundio libyaml - lilv lv2 - pcre pcre2 - reproc - rtaudio + rtaudio_6 rtmidi rubberband - serd - sord sox - sratom + soxr vamp-plugin-sdk xdg-utils xxHash + yyjson zix zstd ]; - patches = [ - # Fix gcc-13 build failure - (fetchpatch { - name = "gcc-13.patch"; - url = "https://gitlab.zrythm.org/zrythm/zrythm/-/commit/cbc2b3715b939718479631841f2d9703fb28e6da.diff"; - hash = "sha256-2ZTSaCtSO3yynJVFe5B1AEjWhjRa5YyA26ergAfdL5Y="; - }) - ]; - # Zrythm uses meson to build, but requires cmake for dependency detection. dontUseCmakeConfigure = true; @@ -197,7 +174,6 @@ stdenv.mkDerivation rec { "-Dmanpage=true" "-Drtaudio=enabled" "-Drtmidi=enabled" - "-Dsdl=enabled" # "-Duser_manual=true" # needs sphinx-intl ]; @@ -220,7 +196,7 @@ stdenv.mkDerivation rec { preFixup = '' gappsWrapperArgs+=( - --prefix GSETTINGS_SCHEMA_DIR : "$out/share/gsettings-schemas/${pname}-${version}/glib-2.0/schemas/" + --prefix GSETTINGS_SCHEMA_DIR : "$out/share/gsettings-schemas/${finalAttrs.pname}-${finalAttrs.version}/glib-2.0/schemas/" --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${breeze-icons}/share" ) ''; @@ -228,8 +204,9 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.zrythm.org"; description = "Automated and intuitive digital audio workstation"; - maintainers = with maintainers; [ tshaynik magnetophon yuu ]; - platforms = platforms.linux; + maintainers = with maintainers; [ tshaynik magnetophon yuu astavie PowerUser64 ]; + platforms = platforms.unix; + broken = stdenv.isDarwin; license = licenses.agpl3Plus; }; -} +}) diff --git a/pkgs/applications/backup/timeshift/wrapper.nix b/pkgs/applications/backup/timeshift/wrapper.nix index e72052fda1ba8..84b3f14ac2ffa 100644 --- a/pkgs/applications/backup/timeshift/wrapper.nix +++ b/pkgs/applications/backup/timeshift/wrapper.nix @@ -1,6 +1,6 @@ { stdenvNoCC , lib -, wrapGAppsHook +, wrapGAppsHook3 , gdk-pixbuf , librsvg , xorg @@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation { nativeBuildInputs = [ xorg.lndir - wrapGAppsHook + wrapGAppsHook3 ]; installPhase = '' diff --git a/pkgs/applications/display-managers/greetd/gtkgreet.nix b/pkgs/applications/display-managers/greetd/gtkgreet.nix index 674257e8526e4..10389c262742f 100644 --- a/pkgs/applications/display-managers/greetd/gtkgreet.nix +++ b/pkgs/applications/display-managers/greetd/gtkgreet.nix @@ -1,7 +1,7 @@ { stdenv , lib , fetchFromSourcehut -, wrapGAppsHook +, wrapGAppsHook3 , pkg-config , cmake , meson @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meson ninja cmake - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix b/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix index a35b52bf8cd69..b8082c4510d6e 100644 --- a/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix +++ b/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, pkg-config, linkFarm, lightdm-enso-os-greeter , dbus, pcre, libepoxy, xorg, at-spi2-core, libxklavier, libxkbcommon -, gtk3, vala, cmake, libgee, lightdm, gdk-pixbuf, clutter-gtk, wrapGAppsHook, librsvg }: +, gtk3, vala, cmake, libgee, lightdm, gdk-pixbuf, clutter-gtk, wrapGAppsHook3, librsvg }: stdenv.mkDerivation { pname = "lightdm-enso-os-greeter"; @@ -21,7 +21,7 @@ stdenv.mkDerivation { cmake pkg-config vala - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix b/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix index 353e5150356f9..16fa1cfe4dcf3 100644 --- a/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix +++ b/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, linkFarm, lightdm-mini-greeter, fetchFromGitHub, autoreconfHook, pkg-config, lightdm, gtk3, glib, gdk-pixbuf, wrapGAppsHook, librsvg }: +{ lib, stdenv, linkFarm, lightdm-mini-greeter, fetchFromGitHub, autoreconfHook, pkg-config, lightdm, gtk3, glib, gdk-pixbuf, wrapGAppsHook3, librsvg }: stdenv.mkDerivation rec { pname = "lightdm-mini-greeter"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-Pm7ExfusFIPktX2C4UE07qgOVhcWhVxnaD3QARpmu7Y="; }; - nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook3 ]; buildInputs = [ lightdm gtk3 glib gdk-pixbuf librsvg ]; configureFlags = [ "--sysconfdir=/etc" ]; diff --git a/pkgs/applications/display-managers/lightdm-slick-greeter/default.nix b/pkgs/applications/display-managers/lightdm-slick-greeter/default.nix index 67bbf37545349..b7aded60260d5 100644 --- a/pkgs/applications/display-managers/lightdm-slick-greeter/default.nix +++ b/pkgs/applications/display-managers/lightdm-slick-greeter/default.nix @@ -6,7 +6,7 @@ , vala , intltool , autoreconfHook -, wrapGAppsHook +, wrapGAppsHook3 , cinnamon , lightdm , gtk3 @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { vala intltool autoreconfHook - wrapGAppsHook + wrapGAppsHook3 python3 python3.pkgs.wrapPython ]; diff --git a/pkgs/applications/display-managers/lightdm-tiny-greeter/default.nix b/pkgs/applications/display-managers/lightdm-tiny-greeter/default.nix index c6c479505d12c..1090be3c932eb 100644 --- a/pkgs/applications/display-managers/lightdm-tiny-greeter/default.nix +++ b/pkgs/applications/display-managers/lightdm-tiny-greeter/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, linkFarm, lightdm-tiny-greeter, fetchFromGitHub -, pkg-config, lightdm, gtk3, glib, wrapGAppsHook, config, conf ? config.lightdm-tiny-greeter.conf or "" }: +, pkg-config, lightdm, gtk3, glib, wrapGAppsHook3, config, conf ? config.lightdm-tiny-greeter.conf or "" }: stdenv.mkDerivation rec { pname = "lightdm-tiny-greeter"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "08azpj7b5qgac9bgi1xvd6qy6x2nb7iapa0v40ggr3d1fabyhrg6"; }; - nativeBuildInputs = [ pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook3 ]; buildInputs = [ lightdm gtk3 glib ]; postUnpack = lib.optionalString (conf != "") '' diff --git a/pkgs/applications/display-managers/lightdm/gtk-greeter.nix b/pkgs/applications/display-managers/lightdm/gtk-greeter.nix index 6d29d90d4b565..e3ef95bdcdc67 100644 --- a/pkgs/applications/display-managers/lightdm/gtk-greeter.nix +++ b/pkgs/applications/display-managers/lightdm/gtk-greeter.nix @@ -6,7 +6,7 @@ , pkg-config , intltool , linkFarm -, wrapGAppsHook +, wrapGAppsHook3 , gtk3 , xfce4-dev-tools , at-spi2-core @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { pkg-config intltool xfce4-dev-tools - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { "--localstatedir=/var" "--sysconfdir=/etc" "--disable-indicator-services-command" - "--sbindir=${placeholder "out"}/bin" # for wrapGAppsHook to wrap automatically + "--sbindir=${placeholder "out"}/bin" # for wrapGAppsHook3 to wrap automatically ]; preConfigure = '' diff --git a/pkgs/applications/editors/apostrophe/default.nix b/pkgs/applications/editors/apostrophe/default.nix index 501f820664f2f..768402f4e5a7c 100644 --- a/pkgs/applications/editors/apostrophe/default.nix +++ b/pkgs/applications/editors/apostrophe/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitLab, meson, ninja -, wrapGAppsHook, pkg-config, desktop-file-utils +, wrapGAppsHook3, pkg-config, desktop-file-utils , appstream-glib, pythonPackages, glib, gobject-introspection , gtk3, webkitgtk, glib-networking, gnome, gspell, texliveMedium , shared-mime-info, libhandy, fira, sassc @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ meson ninja pkg-config desktop-file-utils - appstream-glib wrapGAppsHook sassc gobject-introspection ]; + appstream-glib wrapGAppsHook3 sassc gobject-introspection ]; buildInputs = [ glib pythonEnv gtk3 gnome.adwaita-icon-theme webkitgtk gspell texliveMedium diff --git a/pkgs/applications/editors/bluefish/default.nix b/pkgs/applications/editors/bluefish/default.nix index afcc62a289994..41b107f0dcae3 100644 --- a/pkgs/applications/editors/bluefish/default.nix +++ b/pkgs/applications/editors/bluefish/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchurl -, wrapGAppsHook +, wrapGAppsHook3 , pkg-config , gtk , libxml2 @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-YUPlHGtVedWW86moXg8NhYDJ9Y+ChXWxGYgODKHZQbw="; }; - nativeBuildInputs = [ pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook3 ]; buildInputs = [ gnome.adwaita-icon-theme gtk diff --git a/pkgs/applications/editors/bluej/default.nix b/pkgs/applications/editors/bluej/default.nix index 32dc84f33a699..0e8629a0693c6 100644 --- a/pkgs/applications/editors/bluej/default.nix +++ b/pkgs/applications/editors/bluej/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, openjdk, glib, dpkg, wrapGAppsHook }: +{ lib, stdenv, fetchurl, openjdk, glib, dpkg, wrapGAppsHook3 }: stdenv.mkDerivation rec { pname = "bluej"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-sOT86opMa9ytxJlfURIsD06HiP+j+oz3lQ0DqmLV1wE="; }; - nativeBuildInputs = [ dpkg wrapGAppsHook ]; + nativeBuildInputs = [ dpkg wrapGAppsHook3 ]; buildInputs = [ glib ]; dontWrapGApps = true; diff --git a/pkgs/applications/editors/codeblocks/default.nix b/pkgs/applications/editors/codeblocks/default.nix index 60edd1871bcac..4c53fbb2a4b7c 100644 --- a/pkgs/applications/editors/codeblocks/default.nix +++ b/pkgs/applications/editors/codeblocks/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, fetchpatch, pkg-config, file, zip, wxGTK32, gtk3 -, contribPlugins ? false, hunspell, gamin, boost, wrapGAppsHook +, contribPlugins ? false, hunspell, gamin, boost, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1idaksw1vacmm83krxh5zlb12kad3dkz9ixh70glw1gaibib7vhm"; }; - nativeBuildInputs = [ pkg-config file zip wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config file zip wrapGAppsHook3 ]; buildInputs = [ wxGTK32 gtk3 ] ++ lib.optionals contribPlugins [ hunspell gamin boost ]; enableParallelBuilding = true; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix index d7cab2f707a24..30d0d83f97327 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix @@ -16,7 +16,7 @@ }: let - rev = "977d344e2e930f3680990014f84ca94877d6eebf"; + rev = "75b1431c1e0f6c221dbfdb0ecd0f62f183b02254"; python = python3.withPackages (ps: with ps; [ epc orjson @@ -28,13 +28,13 @@ let in melpaBuild { pname = "lsp-bridge"; - version = "20240424.1125"; + version = "20240502.2306"; src = fetchFromGitHub { owner = "manateelazycat"; repo = "lsp-bridge"; inherit rev; - hash = "sha256-moG0BaHHN3ySON4aMza43Ub4GKuGV9mGSzC48xoiPl8="; + hash = "sha256-8MqGwHVBE+87IQfsUA6b3ffrVWjypiH3shwELBCUBDQ="; }; commit = rev; diff --git a/pkgs/applications/editors/emacs/make-emacs.nix b/pkgs/applications/editors/emacs/make-emacs.nix index a525335646169..f252923897d18 100644 --- a/pkgs/applications/editors/emacs/make-emacs.nix +++ b/pkgs/applications/editors/emacs/make-emacs.nix @@ -58,7 +58,7 @@ , tree-sitter , texinfo , webkitgtk -, wrapGAppsHook +, wrapGAppsHook3 # Boolean flags , withNativeCompilation ? stdenv.buildPlatform.canExecute stdenv.hostPlatform @@ -212,7 +212,7 @@ mkDerivation (finalAttrs: { ] ++ lib.optionals srcRepo [ autoreconfHook texinfo - ] ++ lib.optional (withPgtk || withX && (withGTK3 || withXwidgets)) wrapGAppsHook; + ] ++ lib.optional (withPgtk || withX && (withGTK3 || withXwidgets)) wrapGAppsHook3; buildInputs = [ gettext diff --git a/pkgs/applications/editors/formiko/default.nix b/pkgs/applications/editors/formiko/default.nix index 53fee165f5e5a..40c7fba0be82e 100644 --- a/pkgs/applications/editors/formiko/default.nix +++ b/pkgs/applications/editors/formiko/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonApplication , fetchFromGitHub -, wrapGAppsHook +, wrapGAppsHook3 , gobject-introspection , gtk3 , docutils @@ -24,7 +24,7 @@ buildPythonApplication rec { }; nativeBuildInputs = [ - wrapGAppsHook + wrapGAppsHook3 gobject-introspection gtk3 ]; diff --git a/pkgs/applications/editors/geany/default.nix b/pkgs/applications/editors/geany/default.nix index 517b2ca4fe79a..f6755905c7394 100644 --- a/pkgs/applications/editors/geany/default.nix +++ b/pkgs/applications/editors/geany/default.nix @@ -8,7 +8,7 @@ , libintl , hicolor-icon-theme , python3 -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation (finalAttrs: { @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { file hicolor-icon-theme python3 - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/editors/gedit/default.nix b/pkgs/applications/editors/gedit/default.nix index 9ec2d3329c1dc..c3fc6fae2dcf1 100644 --- a/pkgs/applications/editors/gedit/default.nix +++ b/pkgs/applications/editors/gedit/default.nix @@ -15,7 +15,7 @@ , libpeas , libxml2 , gsettings-desktop-schemas -, wrapGAppsHook +, wrapGAppsHook3 , gtk-doc , gobject-introspection , docbook-xsl-nons @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { python3 python3Packages.wrapPython vala - wrapGAppsHook + wrapGAppsHook3 gtk-doc gobject-introspection docbook-xsl-nons diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix index e689f9ee7d069..f0e7b272f8a73 100644 --- a/pkgs/applications/editors/gnome-builder/default.nix +++ b/pkgs/applications/editors/gnome-builder/default.nix @@ -5,7 +5,6 @@ , desktop-file-utils , editorconfig-core-c , fetchurl -, fetchpatch , flatpak , gnome , libgit2-glib @@ -43,13 +42,13 @@ stdenv.mkDerivation rec { pname = "gnome-builder"; - version = "45.0"; + version = "46.1"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "JC2gJZMpPUVuokEIpFk0cwoeMW2NxbGNnfDoZNt7pZY="; + hash = "sha256-lhaWbVIqLIUCizPAm605cudp6fkK91VNXnGDfb3HiHE="; }; patches = [ @@ -64,12 +63,6 @@ stdenv.mkDerivation rec { # # Typelib file for namespace 'Pango', version '1.0' not found (g-irepository-error-quark, 0) ./fix-finding-test-typelibs.patch - - (fetchpatch { - name = "redefinition-of-glib_autoptr_clear_GtkStackPage.patch"; - url = "https://gitlab.gnome.org/GNOME/gnome-builder/-/commit/7aaaecefc2ea8a37eaeae8b4d726d119d4eb8fa3.patch"; - hash = "sha256-sYLqhwCd9GOkUMUZAO2trAGKC3013jgivHrNC4atdn0="; - }) ]; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/gnome-inform7/default.nix b/pkgs/applications/editors/gnome-inform7/default.nix index cab490cd76e4c..df1baa997a217 100644 --- a/pkgs/applications/editors/gnome-inform7/default.nix +++ b/pkgs/applications/editors/gnome-inform7/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, python3, perl, bison -, texinfo, desktop-file-utils, wrapGAppsHook, docbook2x, docbook-xsl-nons +, texinfo, desktop-file-utils, wrapGAppsHook3, docbook2x, docbook-xsl-nons , inform7, gettext, libossp_uuid, gtk3, gobject-introspection, vala, gtk-doc , webkitgtk, gtksourceview3, gspell, libxml2, goocanvas2, libplist, glib , gst_all_1 }: @@ -22,7 +22,7 @@ let pkg-config docbook2x docbook-xsl-nons - wrapGAppsHook + wrapGAppsHook3 gobject-introspection ]; buildInputs = [ @@ -49,7 +49,7 @@ let texinfo python3 glib - wrapGAppsHook + wrapGAppsHook3 gobject-introspection ]; buildInputs = [ @@ -84,7 +84,7 @@ in stdenv.mkDerivation { inform7 python3 desktop-file-utils - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ gettext diff --git a/pkgs/applications/editors/gnome-latex/default.nix b/pkgs/applications/editors/gnome-latex/default.nix index f78407731d264..505bddde4f5eb 100644 --- a/pkgs/applications/editors/gnome-latex/default.nix +++ b/pkgs/applications/editors/gnome-latex/default.nix @@ -6,7 +6,7 @@ , gtk-doc , vala , gobject-introspection -, wrapGAppsHook +, wrapGAppsHook3 , gsettings-desktop-schemas , gspell , libgedit-gtksourceview @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { gtk-doc vala gobject-introspection - wrapGAppsHook + wrapGAppsHook3 itstool gettext ]; diff --git a/pkgs/applications/editors/gobby/default.nix b/pkgs/applications/editors/gobby/default.nix index d36f89e3c1c73..8801afa34e6c4 100644 --- a/pkgs/applications/editors/gobby/default.nix +++ b/pkgs/applications/editors/gobby/default.nix @@ -1,5 +1,5 @@ { avahiSupport ? false # build support for Avahi in libinfinity -, lib, stdenv, fetchFromGitHub, autoconf, automake, pkg-config, wrapGAppsHook, yelp-tools +, lib, stdenv, fetchFromGitHub, autoconf, automake, pkg-config, wrapGAppsHook3, yelp-tools , gtkmm3, gsasl, gtksourceview3, libxmlxx, libinfinity, intltool, itstool }: let @@ -15,7 +15,7 @@ in stdenv.mkDerivation rec { sha256 = "06cbc2y4xkw89jaa0ayhgh7fxr5p2nv3jjs8h2xcbbbgwaw08lk0"; }; - nativeBuildInputs = [ autoconf automake pkg-config intltool itstool yelp-tools wrapGAppsHook ]; + nativeBuildInputs = [ autoconf automake pkg-config intltool itstool yelp-tools wrapGAppsHook3 ]; buildInputs = [ gtkmm3 gsasl gtksourceview3 libxmlxx libinf ]; preConfigure = "./autogen.sh"; diff --git a/pkgs/applications/editors/greenfoot/default.nix b/pkgs/applications/editors/greenfoot/default.nix index 4a3ae555f21ea..e4734355fd551 100644 --- a/pkgs/applications/editors/greenfoot/default.nix +++ b/pkgs/applications/editors/greenfoot/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, openjdk, glib, dpkg, wrapGAppsHook }: +{ lib, stdenv, fetchurl, openjdk, glib, dpkg, wrapGAppsHook3 }: stdenv.mkDerivation rec { pname = "greenfoot"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { hash = "sha256-wpmgWtx2jTDjt+7p6HcjU/uy1PRmnAHpJ1rOYb+hV+U="; }; - nativeBuildInputs = [ dpkg wrapGAppsHook ]; + nativeBuildInputs = [ dpkg wrapGAppsHook3 ]; buildInputs = [ glib ]; dontWrapGApps = true; diff --git a/pkgs/applications/editors/l3afpad/default.nix b/pkgs/applications/editors/l3afpad/default.nix index 2caf4ee781e2e..f9632def17716 100644 --- a/pkgs/applications/editors/l3afpad/default.nix +++ b/pkgs/applications/editors/l3afpad/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, intltool, pkg-config, gtk3, fetchFromGitHub -, autoreconfHook, wrapGAppsHook }: +, autoreconfHook, wrapGAppsHook3 }: stdenv.mkDerivation rec { version = "unstable-2022-02-14"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-ly2w9jmRlprm/PnyC0LYjrxBVK+J0DLiSpzuTUMZpWA="; }; - nativeBuildInputs = [ pkg-config autoreconfHook wrapGAppsHook intltool ]; + nativeBuildInputs = [ pkg-config autoreconfHook wrapGAppsHook3 intltool ]; buildInputs = [ gtk3 ]; meta = with lib; { diff --git a/pkgs/applications/editors/lapce/default.nix b/pkgs/applications/editors/lapce/default.nix index 73cff823859a2..ad29e72fad159 100644 --- a/pkgs/applications/editors/lapce/default.nix +++ b/pkgs/applications/editors/lapce/default.nix @@ -19,7 +19,7 @@ , ApplicationServices , Carbon , AppKit -, wrapGAppsHook +, wrapGAppsHook3 , wayland , gobject-introspection , xorg @@ -82,7 +82,7 @@ rustPlatform.buildRustPackage rec { pkg-config perl python3 - wrapGAppsHook # FIX: No GSettings schemas are installed on the system + wrapGAppsHook3 # FIX: No GSettings schemas are installed on the system gobject-introspection ]; diff --git a/pkgs/applications/editors/lifeograph/default.nix b/pkgs/applications/editors/lifeograph/default.nix index 2a9557dce62ee..52e12beb317aa 100644 --- a/pkgs/applications/editors/lifeograph/default.nix +++ b/pkgs/applications/editors/lifeograph/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchgit, pkg-config, meson, ninja, wrapGAppsHook +{ stdenv, lib, fetchgit, pkg-config, meson, ninja, wrapGAppsHook3 , enchant, gtkmm3, libchamplain, libgcrypt, shared-mime-info }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ninja pkg-config shared-mime-info # for update-mime-database - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/editors/marker/default.nix b/pkgs/applications/editors/marker/default.nix index f24f83c70f278..7e1d61a3b1725 100644 --- a/pkgs/applications/editors/marker/default.nix +++ b/pkgs/applications/editors/marker/default.nix @@ -5,7 +5,7 @@ , meson , ninja , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , gtk3 , gtksourceview , gtkspell3 @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meson ninja pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/editors/mindforger/default.nix b/pkgs/applications/editors/mindforger/default.nix index de304cd6208af..bd8a4b0c648e6 100644 --- a/pkgs/applications/editors/mindforger/default.nix +++ b/pkgs/applications/editors/mindforger/default.nix @@ -6,7 +6,7 @@ , qmake , qtbase , qtwebengine -, wrapGAppsHook +, wrapGAppsHook3 , wrapQtAppsHook }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sha256 = "1pghsw8kwvjhg3jpmjs0n892h2l0pm0cs6ymi8b23fwk0kfj67rd"; }; - nativeBuildInputs = [ qmake wrapGAppsHook wrapQtAppsHook ]; + nativeBuildInputs = [ qmake wrapGAppsHook3 wrapQtAppsHook ]; buildInputs = [ qtbase qtwebengine cmark-gfm ]; doCheck = true; diff --git a/pkgs/applications/editors/neovim/utils.nix b/pkgs/applications/editors/neovim/utils.nix index 865c521932818..8f9a5b880032c 100644 --- a/pkgs/applications/editors/neovim/utils.nix +++ b/pkgs/applications/editors/neovim/utils.nix @@ -218,7 +218,7 @@ let ]; in - toVimPlugin (runCommand "vimplugin-treesitter-grammar-${name}" + toVimPlugin (runCommand "treesitter-grammar-${name}" { meta = { platforms = lib.platforms.all; diff --git a/pkgs/applications/editors/pinegrow/default.nix b/pkgs/applications/editors/pinegrow/default.nix index cf5d35c1c296c..2e3de9ae8aa36 100644 --- a/pkgs/applications/editors/pinegrow/default.nix +++ b/pkgs/applications/editors/pinegrow/default.nix @@ -8,7 +8,7 @@ , autoPatchelfHook , gsettings-desktop-schemas , gtk3 -, wrapGAppsHook +, wrapGAppsHook3 , makeWrapper , pinegrowVersion ? "7" }: @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { unzip autoPatchelfHook makeWrapper - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/editors/pulsar/default.nix b/pkgs/applications/editors/pulsar/default.nix index a2b572ae516b8..6cd8e423ad529 100644 --- a/pkgs/applications/editors/pulsar/default.nix +++ b/pkgs/applications/editors/pulsar/default.nix @@ -3,7 +3,7 @@ , git , git-lfs , fetchurl -, wrapGAppsHook +, wrapGAppsHook3 , alsa-lib , at-spi2-atk , cairo @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - wrapGAppsHook + wrapGAppsHook3 copyDesktopItems asar ]; diff --git a/pkgs/applications/editors/sublime/3/common.nix b/pkgs/applications/editors/sublime/3/common.nix index bbb7e6f1e918b..65bbd65163283 100644 --- a/pkgs/applications/editors/sublime/3/common.nix +++ b/pkgs/applications/editors/sublime/3/common.nix @@ -1,6 +1,6 @@ { buildVersion, x32sha256, x64sha256, dev ? false }: -{ fetchurl, lib, stdenv, xorg, glib, glibcLocales, gtk3, cairo, pango, libredirect, makeWrapper, wrapGAppsHook +{ fetchurl, lib, stdenv, xorg, glib, glibcLocales, gtk3, cairo, pango, libredirect, makeWrapper, wrapGAppsHook3 , pkexecPath ? "/run/wrappers/bin/pkexec" , openssl, bzip2, bash, unzip, zip }: @@ -40,7 +40,7 @@ in let dontStrip = true; dontPatchELF = true; buildInputs = [ glib gtk3 ]; # for GSETTINGS_SCHEMAS_PATH - nativeBuildInputs = [ zip unzip makeWrapper wrapGAppsHook ]; + nativeBuildInputs = [ zip unzip makeWrapper wrapGAppsHook3 ]; # make exec.py in Default.sublime-package use own bash with an LD_PRELOAD instead of "/bin/bash" patchPhase = '' diff --git a/pkgs/applications/editors/sublime/4/common.nix b/pkgs/applications/editors/sublime/4/common.nix index a7425863d898d..f8083902fdde4 100644 --- a/pkgs/applications/editors/sublime/4/common.nix +++ b/pkgs/applications/editors/sublime/4/common.nix @@ -17,7 +17,7 @@ cairo, pango, makeWrapper, - wrapGAppsHook, + wrapGAppsHook3, writeShellScript, common-updater-scripts, curl, @@ -80,7 +80,7 @@ let nativeBuildInputs = [ makeWrapper - wrapGAppsHook + wrapGAppsHook3 ]; buildPhase = '' diff --git a/pkgs/applications/editors/texmaker/default.nix b/pkgs/applications/editors/texmaker/default.nix index 4684831416b0d..427948822fbcf 100644 --- a/pkgs/applications/editors/texmaker/default.nix +++ b/pkgs/applications/editors/texmaker/default.nix @@ -1,4 +1,4 @@ -{ lib, mkDerivation, fetchurl, qtbase, qtscript, qtwebengine, qmake, zlib, pkg-config, poppler, wrapGAppsHook }: +{ lib, mkDerivation, fetchurl, qtbase, qtscript, qtwebengine, qmake, zlib, pkg-config, poppler, wrapGAppsHook3 }: mkDerivation rec { pname = "texmaker"; @@ -10,7 +10,7 @@ mkDerivation rec { }; buildInputs = [ qtbase qtscript poppler zlib qtwebengine ]; - nativeBuildInputs = [ pkg-config poppler qmake wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config poppler qmake wrapGAppsHook3 ]; env.NIX_CFLAGS_COMPILE = "-I${poppler.dev}/include/poppler"; qmakeFlags = [ diff --git a/pkgs/applications/editors/thiefmd/default.nix b/pkgs/applications/editors/thiefmd/default.nix index 1b7b4a668b255..d603981302342 100644 --- a/pkgs/applications/editors/thiefmd/default.nix +++ b/pkgs/applications/editors/thiefmd/default.nix @@ -5,7 +5,7 @@ , ninja , vala , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , desktop-file-utils , discount , glib @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ninja vala pkg-config - wrapGAppsHook + wrapGAppsHook3 desktop-file-utils ]; diff --git a/pkgs/applications/editors/tijolo/default.nix b/pkgs/applications/editors/tijolo/default.nix index c3605691ad869..2b76d492924be 100644 --- a/pkgs/applications/editors/tijolo/default.nix +++ b/pkgs/applications/editors/tijolo/default.nix @@ -6,7 +6,7 @@ , libgit2 , editorconfig-core-c , gtksourceview4 -, wrapGAppsHook +, wrapGAppsHook3 , desktopToDarwinBundle }: crystal.buildCrystalPackage rec { @@ -20,7 +20,7 @@ crystal.buildCrystalPackage rec { hash = "sha256-3TfXvRVP3lu43qF3RWCHnZ3czTaSl5EzrhuTlpnMfKo="; }; - nativeBuildInputs = [ wrapGAppsHook ] + nativeBuildInputs = [ wrapGAppsHook3 ] ++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle ]; buildInputs = [ vte libgit2 gtksourceview4 editorconfig-core-c ]; diff --git a/pkgs/applications/editors/vim/full.nix b/pkgs/applications/editors/vim/full.nix index 263f8d2984d0c..0f3652a8a7ded 100644 --- a/pkgs/applications/editors/vim/full.nix +++ b/pkgs/applications/editors/vim/full.nix @@ -4,7 +4,7 @@ , libICE , vimPlugins , makeWrapper -, wrapGAppsHook +, wrapGAppsHook3 , runtimeShell # apple frameworks @@ -135,7 +135,7 @@ in stdenv.mkDerivation { ++ lib.optional wrapPythonDrv makeWrapper ++ lib.optional nlsSupport gettext ++ lib.optional perlSupport perl - ++ lib.optional (guiSupport == "gtk3") wrapGAppsHook + ++ lib.optional (guiSupport == "gtk3") wrapGAppsHook3 ; buildInputs = [ diff --git a/pkgs/applications/editors/vim/plugins/build-vim-plugin.nix b/pkgs/applications/editors/vim/plugins/build-vim-plugin.nix index 1611adc97ee3b..db712305c932c 100644 --- a/pkgs/applications/editors/vim/plugins/build-vim-plugin.nix +++ b/pkgs/applications/editors/vim/plugins/build-vim-plugin.nix @@ -13,7 +13,6 @@ rec { buildVimPlugin = { name ? "${attrs.pname}-${attrs.version}" - , namePrefix ? "vimplugin-" , src , unpackPhase ? "" , configurePhase ? ":" @@ -27,7 +26,7 @@ rec { }@attrs: let drv = stdenv.mkDerivation (attrs // { - name = namePrefix + name; + name = lib.warnIf (attrs ? vimprefix) "The 'vimprefix' is now hardcoded in toVimPlugin" name; inherit unpackPhase configurePhase buildPhase addonInfo preInstall postInstall; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 24435666c0768..0b17b14b7deae 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -78,7 +78,7 @@ , # sved dependencies glib , gobject-introspection -, wrapGAppsHook +, wrapGAppsHook3 , # sniprun dependencies bashInteractive , coreutils @@ -1335,11 +1335,11 @@ sved = let - # we put the script in its own derivation to benefit the magic of wrapGAppsHook + # we put the script in its own derivation to benefit the magic of wrapGAppsHook3 svedbackend = stdenv.mkDerivation { name = "svedbackend-${super.sved.name}"; inherit (super.sved) src; - nativeBuildInputs = [ wrapGAppsHook gobject-introspection ]; + nativeBuildInputs = [ wrapGAppsHook3 gobject-introspection ]; buildInputs = [ glib (python3.withPackages (ps: with ps; [ pygobject3 pynvim dbus-python ])) diff --git a/pkgs/applications/editors/vim/plugins/vim-utils.nix b/pkgs/applications/editors/vim/plugins/vim-utils.nix index 7b023118f0570..d5536ee3b63a8 100644 --- a/pkgs/applications/editors/vim/plugins/vim-utils.nix +++ b/pkgs/applications/editors/vim/plugins/vim-utils.nix @@ -415,6 +415,7 @@ rec { toVimPlugin = drv: drv.overrideAttrs(oldAttrs: { + name = "vimplugin-${oldAttrs.name}"; # dont move the "doc" folder since vim expects it forceShare = [ "man" "info" ]; diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 260711bd4880b..27bce5cd2abfa 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -90,8 +90,8 @@ let mktplcRef = { publisher = "42Crunch"; name = "vscode-openapi"; - version = "4.25.1"; - sha256 = "+hKQUJp9c0oyhePFmQEXAqtqKL3fkQ1nhopUPnhRZc4="; + version = "4.25.3"; + hash = "sha256-1kz/M2od2gLSFgqW6LsPHgtm+BwXA+0+7z3HyqNmsOg="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/42Crunch.vscode-openapi/changelog"; diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix index b7fe7d2712a66..5ed75a0ce32e1 100644 --- a/pkgs/applications/editors/vscode/generic.nix +++ b/pkgs/applications/editors/vscode/generic.nix @@ -165,7 +165,7 @@ in autoPatchelfHook asar # override doesn't preserve splicing https://github.com/NixOS/nixpkgs/issues/132651 - (buildPackages.wrapGAppsHook.override { inherit (buildPackages) makeWrapper; }) + (buildPackages.wrapGAppsHook3.override { inherit (buildPackages) makeWrapper; }) ]; dontBuild = true; diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 3cd3faa79014b..636c8586dd73d 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -30,21 +30,21 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "14m9w7wkg1704apd4d46yi6zwdlbrx2rp3fry9ffk2nn6kkahwk2"; - x86_64-darwin = "1cp74wdkva1zib04wxjby0h8r1c56g893kq5ksdj38404i2c5hdk"; - aarch64-linux = "00yrdmi4c5m8r11gm7vw18qb5ddcwwg5mdk8s9ykzhmxhdrkcarm"; - aarch64-darwin = "1jjhw60jcvj5brayarg8k6avxwaa00mwdn4lrkcdzbzzh1q4knvv"; - armv7l-linux = "1jddc3fsv65mp95ybpprx8sz3mpnp6j2ghp4nflky8iawmzz183v"; + x86_64-linux = "0hy1ppv7wzyy581k3skmckaas0lwkx5l6w4hk1ml5f2cpkkxhq5w"; + x86_64-darwin = "1mybfp2hg93wp3iwgwgkh84gcaj1vgs3gkmgb5yp38jhwxj5wrhk"; + aarch64-linux = "16d0qqm7fm1bm58n7n2cscs619mbxr0bbglgz3prr2cmr7bwmx87"; + aarch64-darwin = "1pp668rf5a06rdb8fd06ajrzxp02z7v6lmr3y77i5n2hs5xnpm0b"; + armv7l-linux = "1cqhlm64gw08rn45ryizx1vypyybsrm9v8piapym5clwswbaxqs5"; }.${system} or throwSystem; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.88.1"; + version = "1.89.0"; pname = "vscode" + lib.optionalString isInsiders "-insiders"; # This is used for VS Code - Remote SSH test - rev = "e170252f762678dec6ca2cc69aba1570769a5d39"; + rev = "b58957e67ee1e712cebf466b995adf4c5307b2bd"; executableName = "code" + lib.optionalString isInsiders "-insiders"; longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders"; @@ -68,7 +68,7 @@ in src = fetchurl { name = "vscode-server-${rev}.tar.gz"; url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable"; - sha256 = "100nhm231gzav24lz84vxwxnqkn777kfn0fkkjmdcd30kc7g7ig9"; + sha256 = "17563d413czlqpy3921gq5ja7mi3lgb8yjgvsqfn3fkaj70gr1hq"; }; }; diff --git a/pkgs/applications/editors/xed-editor/default.nix b/pkgs/applications/editors/xed-editor/default.nix index 8ce15bdce09eb..cb147cf099eb8 100644 --- a/pkgs/applications/editors/xed-editor/default.nix +++ b/pkgs/applications/editors/xed-editor/default.nix @@ -12,7 +12,7 @@ , python3 , meson , ninja -, wrapGAppsHook +, wrapGAppsHook3 , intltool , itstool }: @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { itstool ninja python3 - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/emulators/bsnes/ares/default.nix b/pkgs/applications/emulators/bsnes/ares/default.nix index 0a5993557a08f..ade90d3885676 100644 --- a/pkgs/applications/emulators/bsnes/ares/default.nix +++ b/pkgs/applications/emulators/bsnes/ares/default.nix @@ -16,7 +16,7 @@ , pkg-config , udev , which -, wrapGAppsHook +, wrapGAppsHook3 , darwin }: @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkg-config which - wrapGAppsHook + wrapGAppsHook3 ] ++ lib.optionals stdenv.isDarwin [ libicns ]; diff --git a/pkgs/applications/emulators/bsnes/bsnes-hd/default.nix b/pkgs/applications/emulators/bsnes/bsnes-hd/default.nix index 5ac2100425384..4b8e94dac1d10 100644 --- a/pkgs/applications/emulators/bsnes/bsnes-hd/default.nix +++ b/pkgs/applications/emulators/bsnes/bsnes-hd/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, fetchpatch , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , libX11, libXv , udev , SDL2 @@ -47,7 +47,7 @@ stdenv.mkDerivation { ]; nativeBuildInputs = [ pkg-config ] - ++ lib.optionals stdenv.isLinux [ wrapGAppsHook ] + ++ lib.optionals stdenv.isLinux [ wrapGAppsHook3 ] ++ lib.optionals stdenv.isDarwin [ libicns makeWrapper ]; buildInputs = [ SDL2 libao ] diff --git a/pkgs/applications/emulators/cemu/default.nix b/pkgs/applications/emulators/cemu/default.nix index a51982a19cd4c..69f6fccd73c82 100644 --- a/pkgs/applications/emulators/cemu/default.nix +++ b/pkgs/applications/emulators/cemu/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub , addOpenGLRunpath -, wrapGAppsHook +, wrapGAppsHook3 , cmake , glslang , nasm @@ -46,13 +46,13 @@ let in stdenv.mkDerivation rec { pname = "cemu"; - version = "2.0-79"; + version = "2.0-80"; src = fetchFromGitHub { owner = "cemu-project"; repo = "Cemu"; rev = "v${version}"; - hash = "sha256-vSZLiRzOOJJMgycjI5xpgJcUAj5WCz241mAABgNuECw="; + hash = "sha256-uNGRiotitt+fWpJFCno04XiCSD1p38QEqw042Bq/IGc="; }; patches = [ @@ -64,7 +64,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ addOpenGLRunpath - wrapGAppsHook + wrapGAppsHook3 cmake glslang nasm diff --git a/pkgs/applications/emulators/desmume/default.nix b/pkgs/applications/emulators/desmume/default.nix index 63ebe07202870..89078bc6411a5 100644 --- a/pkgs/applications/emulators/desmume/default.nix +++ b/pkgs/applications/emulators/desmume/default.nix @@ -6,7 +6,7 @@ , agg , alsa-lib , desktop-file-utils -, wrapGAppsHook +, wrapGAppsHook3 , gtk3 , intltool , libGLU @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { ]; nativeBuildInputs = [ - wrapGAppsHook + wrapGAppsHook3 desktop-file-utils intltool libtool diff --git a/pkgs/applications/emulators/fuse-emulator/default.nix b/pkgs/applications/emulators/fuse-emulator/default.nix index 378437ca30c87..3ed4ffc9c0731 100644 --- a/pkgs/applications/emulators/fuse-emulator/default.nix +++ b/pkgs/applications/emulators/fuse-emulator/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, perl, pkg-config, wrapGAppsHook +{ lib, stdenv, fetchurl, perl, pkg-config, wrapGAppsHook3 , SDL, bzip2, glib, gtk3, libgcrypt, libpng, libspectrum, libxml2, zlib }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-Oo/t8v/pR8VxVhusVaWa2tTFkzj3TkSbfnpn2coEcJY="; }; - nativeBuildInputs = [ perl pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ perl pkg-config wrapGAppsHook3 ]; buildInputs = [ SDL bzip2 glib gtk3 libgcrypt libpng libspectrum libxml2 zlib ]; diff --git a/pkgs/applications/emulators/pcem/default.nix b/pkgs/applications/emulators/pcem/default.nix index e680dd450d304..9ffa24a66e308 100644 --- a/pkgs/applications/emulators/pcem/default.nix +++ b/pkgs/applications/emulators/pcem/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchzip, wxGTK32, coreutils, SDL2, openal, alsa-lib, pkg-config, gtk3, wrapGAppsHook +{ stdenv, lib, fetchzip, wxGTK32, coreutils, SDL2, openal, alsa-lib, pkg-config, gtk3, wrapGAppsHook3 , autoreconfHook, withNetworking ? true, withALSA ? true }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "067pbnc15h6a4pnnym82klr1w8qwfm6p0pkx93gx06wvwqsxvbdv"; }; - nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook3 ]; buildInputs = [ wxGTK32 coreutils SDL2 openal gtk3 ] ++ lib.optional withALSA alsa-lib; diff --git a/pkgs/applications/emulators/pcsxr/default.nix b/pkgs/applications/emulators/pcsxr/default.nix index b80c32bd9edaa..06559af0e7328 100644 --- a/pkgs/applications/emulators/pcsxr/default.nix +++ b/pkgs/applications/emulators/pcsxr/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, autoreconfHook, intltool, pkg-config, gtk3, SDL2, xorg -, wrapGAppsHook, libcdio, nasm, ffmpeg_4, file +, wrapGAppsHook3, libcdio, nasm, ffmpeg_4, file , fetchpatch }: stdenv.mkDerivation rec { @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { ./0001-libpcsxcore-fix-build-with-ffmpeg-4.patch ]; - nativeBuildInputs = [ autoreconfHook intltool pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ autoreconfHook intltool pkg-config wrapGAppsHook3 ]; buildInputs = [ gtk3 SDL2 xorg.libXv xorg.libXtst libcdio nasm ffmpeg_4 file xorg.libXxf86vm diff --git a/pkgs/applications/emulators/ruffle/default.nix b/pkgs/applications/emulators/ruffle/default.nix index 0f5501508afb1..d0ba464858b3e 100644 --- a/pkgs/applications/emulators/ruffle/default.nix +++ b/pkgs/applications/emulators/ruffle/default.nix @@ -13,7 +13,7 @@ , jre_minimal , cairo , gtk3 -, wrapGAppsHook +, wrapGAppsHook3 , gsettings-desktop-schemas , glib , libxkbcommon @@ -37,7 +37,7 @@ rustPlatform.buildRustPackage rec { makeWrapper pkg-config python3 - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/emulators/sameboy/default.nix b/pkgs/applications/emulators/sameboy/default.nix index 09d0136c6d88a..643092b0a06b7 100644 --- a/pkgs/applications/emulators/sameboy/default.nix +++ b/pkgs/applications/emulators/sameboy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, gtk3, rgbds, SDL2, wrapGAppsHook, glib }: +{ lib, stdenv, fetchFromGitHub, gtk3, rgbds, SDL2, wrapGAppsHook3, glib }: stdenv.mkDerivation rec { pname = "sameboy"; @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { }; enableParallelBuilding = true; - # glib and wrapGAppsHook are needed to make the Open ROM menu work. - nativeBuildInputs = [ rgbds glib wrapGAppsHook ]; + # glib and wrapGAppsHook3 are needed to make the Open ROM menu work. + nativeBuildInputs = [ rgbds glib wrapGAppsHook3 ]; buildInputs = [ SDL2 ]; makeFlags = [ diff --git a/pkgs/applications/emulators/vice/default.nix b/pkgs/applications/emulators/vice/default.nix index 7b3a12a4131d5..cea0f48d01668 100644 --- a/pkgs/applications/emulators/vice/default.nix +++ b/pkgs/applications/emulators/vice/default.nix @@ -20,7 +20,7 @@ , runtimeShell , xa , file -, wrapGAppsHook +, wrapGAppsHook3 , xdg-utils }: @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { file flex pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/file-managers/krusader/default.nix b/pkgs/applications/file-managers/krusader/default.nix index fe0d596f4122d..0df5ed386c43e 100644 --- a/pkgs/applications/file-managers/krusader/default.nix +++ b/pkgs/applications/file-managers/krusader/default.nix @@ -3,7 +3,7 @@ , fetchurl , extra-cmake-modules , kdoctools -, wrapGAppsHook +, wrapGAppsHook3 , karchive , kconfig , kcrash @@ -30,7 +30,7 @@ mkDerivation rec { nativeBuildInputs = [ extra-cmake-modules kdoctools - wrapGAppsHook + wrapGAppsHook3 ]; propagatedBuildInputs = [ diff --git a/pkgs/applications/file-managers/pcmanfm/default.nix b/pkgs/applications/file-managers/pcmanfm/default.nix index bfbe68d885e63..5c614fdede9f2 100644 --- a/pkgs/applications/file-managers/pcmanfm/default.nix +++ b/pkgs/applications/file-managers/pcmanfm/default.nix @@ -7,7 +7,7 @@ , libX11 , pango , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , gnome , withGtk3 ? true , gtk2 @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ glib gtk libfm' libX11 pango gnome.adwaita-icon-theme ]; - nativeBuildInputs = [ pkg-config wrapGAppsHook intltool ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook3 intltool ]; configureFlags = optional withGtk3 "--with-gtk=3"; diff --git a/pkgs/applications/file-managers/spacefm/default.nix b/pkgs/applications/file-managers/spacefm/default.nix index 1cab33edb9449..4de3580c1df3e 100644 --- a/pkgs/applications/file-managers/spacefm/default.nix +++ b/pkgs/applications/file-managers/spacefm/default.nix @@ -1,5 +1,5 @@ { pkgs, fetchFromGitHub, lib, stdenv, gtk3, udev, desktop-file-utils -, shared-mime-info, intltool, pkg-config, wrapGAppsHook, ffmpegthumbnailer +, shared-mime-info, intltool, pkg-config, wrapGAppsHook3, ffmpegthumbnailer , jmtpfs, ifuseSupport ? false, ifuse ? null, lsof, udisks2 }: stdenv.mkDerivation rec { @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config intltool ]; buildInputs = [ gtk3 udev desktop-file-utils shared-mime-info - wrapGAppsHook ffmpegthumbnailer jmtpfs lsof udisks2 + wrapGAppsHook3 ffmpegthumbnailer jmtpfs lsof udisks2 ] ++ (lib.optionals ifuseSupport [ ifuse ]); # Introduced because ifuse doesn't build due to CVEs in libplist # Revert when libplist builds again… diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix index 9dc83fdf23976..4eb10a34d2e24 100644 --- a/pkgs/applications/gis/grass/default.nix +++ b/pkgs/applications/gis/grass/default.nix @@ -3,7 +3,7 @@ , callPackage , fetchFromGitHub , makeWrapper -, wrapGAppsHook +, wrapGAppsHook3 , bison , blas @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ makeWrapper - wrapGAppsHook + wrapGAppsHook3 bison flex diff --git a/pkgs/applications/gis/qgis/unwrapped-ltr.nix b/pkgs/applications/gis/qgis/unwrapped-ltr.nix index 3476816b1c230..bc0033746b19f 100644 --- a/pkgs/applications/gis/qgis/unwrapped-ltr.nix +++ b/pkgs/applications/gis/qgis/unwrapped-ltr.nix @@ -3,7 +3,7 @@ , makeWrapper , mkDerivation , substituteAll -, wrapGAppsHook +, wrapGAppsHook3 , wrapQtAppsHook , withGrass ? true @@ -94,7 +94,7 @@ in mkDerivation rec { nativeBuildInputs = [ makeWrapper - wrapGAppsHook + wrapGAppsHook3 wrapQtAppsHook bison diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index d112ed50a0d52..0cea5f998009f 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -3,7 +3,7 @@ , makeWrapper , mkDerivation , substituteAll -, wrapGAppsHook +, wrapGAppsHook3 , wrapQtAppsHook , withGrass ? true @@ -95,7 +95,7 @@ in mkDerivation rec { nativeBuildInputs = [ makeWrapper - wrapGAppsHook + wrapGAppsHook3 wrapQtAppsHook bison diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 568a8a0ac02e9..a42ab93900cbe 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -50,13 +50,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "imagemagick"; - version = "7.1.1-29"; + version = "7.1.1-30"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = finalAttrs.version; - hash = "sha256-W9WbHzmTa0dA9+mOxXu88qmN1mO9ORaH0Nj6r2s1Q+E="; + hash = "sha256-btXl1J/WjV+5BZibgUzylVmBrhR3KBK/ZSbP0B2fM5c="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big diff --git a/pkgs/applications/graphics/akira/default.nix b/pkgs/applications/graphics/akira/default.nix index 3903a3acd8eac..03278888c8bab 100644 --- a/pkgs/applications/graphics/akira/default.nix +++ b/pkgs/applications/graphics/akira/default.nix @@ -9,7 +9,7 @@ , pkg-config , python3 , vala -, wrapGAppsHook +, wrapGAppsHook3 , cairo , glib , goocanvas3 @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { pkg-config python3 vala - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix index a6a3563743b36..c10f85a99dcec 100644 --- a/pkgs/applications/graphics/avocode/default.nix +++ b/pkgs/applications/graphics/avocode/default.nix @@ -1,6 +1,6 @@ { 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 -, xorg, mozjpeg, makeWrapper, wrapGAppsHook, libuuid, at-spi2-core, libdrm, mesa, libxkbcommon +, xorg, mozjpeg, makeWrapper, wrapGAppsHook3, libuuid, at-spi2-core, libdrm, mesa, libxkbcommon }: stdenv.mkDerivation rec { @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { comment = "The bridge between designers and developers"; }; - nativeBuildInputs = [makeWrapper wrapGAppsHook unzip]; + nativeBuildInputs = [makeWrapper wrapGAppsHook3 unzip]; buildInputs = [ gtk3 gnome.adwaita-icon-theme ]; # src is producing multiple folder on unzip so we must diff --git a/pkgs/applications/graphics/ciano/default.nix b/pkgs/applications/graphics/ciano/default.nix index 7b96dc1f793d5..454a1d28c4772 100644 --- a/pkgs/applications/graphics/ciano/default.nix +++ b/pkgs/applications/graphics/ciano/default.nix @@ -11,7 +11,7 @@ , pkg-config , python , vala -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { pkg-config python vala - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/graphics/cloudcompare/default.nix b/pkgs/applications/graphics/cloudcompare/default.nix index e78b95c363b6e..f66189e0c75c1 100644 --- a/pkgs/applications/graphics/cloudcompare/default.nix +++ b/pkgs/applications/graphics/cloudcompare/default.nix @@ -20,7 +20,7 @@ , qttools , tbb , xercesc -, wrapGAppsHook +, wrapGAppsHook3 }: mkDerivation rec { @@ -38,7 +38,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake eigen # header-only - wrapGAppsHook + wrapGAppsHook3 copyDesktopItems ]; diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index 324ba3cf8a9c0..c2b8ade1f295a 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -4,7 +4,7 @@ , libsoup , graphicsmagick , json-glib -, wrapGAppsHook +, wrapGAppsHook3 , cairo , cmake , ninja @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { ]; - nativeBuildInputs = [ cmake ninja llvmPackages.llvm pkg-config intltool perl desktop-file-utils wrapGAppsHook ]; + nativeBuildInputs = [ cmake ninja llvmPackages.llvm pkg-config intltool perl desktop-file-utils wrapGAppsHook3 ]; buildInputs = [ cairo diff --git a/pkgs/applications/graphics/dia/default.nix b/pkgs/applications/graphics/dia/default.nix index c79f50e86d799..534d1f5884b92 100644 --- a/pkgs/applications/graphics/dia/default.nix +++ b/pkgs/applications/graphics/dia/default.nix @@ -15,7 +15,7 @@ , pkg-config , poppler , python3 -, wrapGAppsHook +, wrapGAppsHook3 # Building with docs are still failing in unstable-2023-09-28 , withDocs ? false }: @@ -60,7 +60,7 @@ stdenv.mkDerivation { meson ninja pkg-config - wrapGAppsHook + wrapGAppsHook3 ] ++ lib.optionals withDocs [ dblatex diff --git a/pkgs/applications/graphics/drawing/default.nix b/pkgs/applications/graphics/drawing/default.nix index 90caf78d63135..cf4b650219194 100644 --- a/pkgs/applications/graphics/drawing/default.nix +++ b/pkgs/applications/graphics/drawing/default.nix @@ -8,7 +8,7 @@ , appstream-glib , desktop-file-utils , gobject-introspection -, wrapGAppsHook +, wrapGAppsHook3 , glib , gdk-pixbuf , pango @@ -36,7 +36,7 @@ python3.pkgs.buildPythonApplication rec { meson ninja pkg-config - wrapGAppsHook + wrapGAppsHook3 glib gettext itstool diff --git a/pkgs/applications/graphics/figma-linux/default.nix b/pkgs/applications/graphics/figma-linux/default.nix index fd136a5b40264..6c794c9706bb2 100644 --- a/pkgs/applications/graphics/figma-linux/default.nix +++ b/pkgs/applications/graphics/figma-linux/default.nix @@ -4,7 +4,7 @@ , fetchurl , autoPatchelfHook , dpkg -, wrapGAppsHook +, wrapGAppsHook3 , ... }: with lib; @@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-9UfyCqgsg9XAFyZ7V7TogkQou4x+ixFUfjXZ1/qlDmA="; }; - nativeBuildInputs = [ autoPatchelfHook dpkg wrapGAppsHook ]; + nativeBuildInputs = [ autoPatchelfHook dpkg wrapGAppsHook3 ]; buildInputs = with pkgs;[ alsa-lib diff --git a/pkgs/applications/graphics/fondo/default.nix b/pkgs/applications/graphics/fondo/default.nix index f3854b4c69890..46c2c72d91ad3 100644 --- a/pkgs/applications/graphics/fondo/default.nix +++ b/pkgs/applications/graphics/fondo/default.nix @@ -17,7 +17,7 @@ , json-glib , glib-networking , desktop-file-utils -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { pkg-config python3 vala - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/graphics/gcolor3/default.nix b/pkgs/applications/graphics/gcolor3/default.nix index ae36266f29c8d..a5b89a605d55b 100644 --- a/pkgs/applications/graphics/gcolor3/default.nix +++ b/pkgs/applications/graphics/gcolor3/default.nix @@ -7,7 +7,7 @@ , libxml2 , gtk3 , libportal-gtk3 -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { gettext pkg-config libxml2 # xml-stripblanks preprocessing of GResource - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix index c88e068615bef..4eeb330f6d27e 100644 --- a/pkgs/applications/graphics/geeqie/default.nix +++ b/pkgs/applications/graphics/geeqie/default.nix @@ -3,7 +3,7 @@ , libarchive, djvulibre, libheif, openjpeg, libjxl, libraw, lua5_3, poppler , gspell, libtiff, libwebp , gphoto2, imagemagick, yad, exiftool, gnome, libnotify -, wrapGAppsHook, fetchpatch, doxygen +, wrapGAppsHook3, fetchpatch, doxygen , nix-update-script }: @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config gettext intltool - wrapGAppsHook doxygen + wrapGAppsHook3 doxygen meson ninja xxd ]; diff --git a/pkgs/applications/graphics/gnome-photos/default.nix b/pkgs/applications/graphics/gnome-photos/default.nix index fe100492a95cd..045a42d0e29d5 100644 --- a/pkgs/applications/graphics/gnome-photos/default.nix +++ b/pkgs/applications/graphics/gnome-photos/default.nix @@ -30,7 +30,7 @@ , python3 , tracker , tracker-miners -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { pygobject3 pyatspi ])) - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/graphics/goxel/default.nix b/pkgs/applications/graphics/goxel/default.nix index 000fd3719263f..2ffa57280eaa8 100644 --- a/pkgs/applications/graphics/goxel/default.nix +++ b/pkgs/applications/graphics/goxel/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, scons, pkg-config, wrapGAppsHook +{ lib, stdenv, fetchFromGitHub, scons, pkg-config, wrapGAppsHook3 , glfw3, gtk3, libpng }: stdenv.mkDerivation (finalAttrs: { @@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-ueA0YW2n/DXd9AytDzfPtvtXbvuUm4VDwcdvHWObKxc="; }; - nativeBuildInputs = [ scons pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ scons pkg-config wrapGAppsHook3 ]; buildInputs = [ glfw3 gtk3 libpng ]; buildPhase = '' diff --git a/pkgs/applications/graphics/gscan2pdf/default.nix b/pkgs/applications/graphics/gscan2pdf/default.nix index d7ebb0a747ea3..0989c07d8a6f9 100644 --- a/pkgs/applications/graphics/gscan2pdf/default.nix +++ b/pkgs/applications/graphics/gscan2pdf/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, perlPackages, wrapGAppsHook, fetchpatch, +{ lib, fetchurl, perlPackages, wrapGAppsHook3, fetchpatch, # libs librsvg, sane-backends, sane-frontends, # runtime dependencies @@ -28,7 +28,7 @@ perlPackages.buildPerlPackage rec { ./image-utf8-fix.patch ]; - nativeBuildInputs = [ wrapGAppsHook ]; + nativeBuildInputs = [ wrapGAppsHook3 ]; buildInputs = [ librsvg sane-backends sane-frontends ] ++ diff --git a/pkgs/applications/graphics/gscreenshot/default.nix b/pkgs/applications/graphics/gscreenshot/default.nix index b3b9deedffa21..a09b39bdadb45 100644 --- a/pkgs/applications/graphics/gscreenshot/default.nix +++ b/pkgs/applications/graphics/gscreenshot/default.nix @@ -4,7 +4,7 @@ , gettext , gobject-introspection , gtk3 -, wrapGAppsHook +, wrapGAppsHook3 , xdg-utils , scrot , slop @@ -27,12 +27,12 @@ python3Packages.buildPythonApplication rec { sha256 = "sha256-BA118PwMslqvnlRES2fEgTjzfNvKNVae7GzWSyuaqYM="; }; - # needed for wrapGAppsHook to function + # needed for wrapGAppsHook3 to function strictDeps = false; # tests require a display and fail doCheck = false; - nativeBuildInputs = [ wrapGAppsHook ]; + nativeBuildInputs = [ wrapGAppsHook3 ]; propagatedBuildInputs = [ gettext gobject-introspection diff --git a/pkgs/applications/graphics/gthumb/default.nix b/pkgs/applications/graphics/gthumb/default.nix index ca9406044fc92..fc59139694515 100644 --- a/pkgs/applications/graphics/gthumb/default.nix +++ b/pkgs/applications/graphics/gthumb/default.nix @@ -26,7 +26,7 @@ , bison , flex , clutter-gtk -, wrapGAppsHook +, wrapGAppsHook3 , shared-mime-info , python3 , desktop-file-utils @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { ninja pkg-config python3 - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix index 6a0408f98f139..e7c3d7f8972dd 100644 --- a/pkgs/applications/graphics/hugin/default.nix +++ b/pkgs/applications/graphics/hugin/default.nix @@ -30,7 +30,7 @@ , perlPackages , sqlite , vigra -, wrapGAppsHook +, wrapGAppsHook3 , wxGTK , zlib }: @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { zlib ]; - nativeBuildInputs = [ cmake makeWrapper pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ cmake makeWrapper pkg-config wrapGAppsHook3 ]; # disable installation of the python scripting interface cmakeFlags = [ "-DBUILD_HSI:BOOl=OFF" ]; diff --git a/pkgs/applications/graphics/icon-library/default.nix b/pkgs/applications/graphics/icon-library/default.nix index 25cc1ebebfbc3..3dae4b0e1b687 100644 --- a/pkgs/applications/graphics/icon-library/default.nix +++ b/pkgs/applications/graphics/icon-library/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { pname = "icon-library"; - version = "0.0.18"; + version = "0.0.19"; src = fetchurl { - url = "https://gitlab.gnome.org/World/design/icon-library/uploads/874b27fcf34662d9686f670d406142c2/icon-library-${version}.tar.xz"; - hash = "sha256-qCGwTePA817mulFjyRZKw+Fw1S77+QTtA7WH+KocL48="; + url = "https://gitlab.gnome.org/World/design/icon-library/uploads/7725604ce39be278abe7c47288085919/icon-library-${version}.tar.xz"; + hash = "sha256-nWGTYoSa0/fxnD0Mb2132LkeB1oa/gj/oIXBbI+FDw8="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/ideogram/default.nix b/pkgs/applications/graphics/ideogram/default.nix index 12706d6d36f61..721bc1c7f9ad1 100644 --- a/pkgs/applications/graphics/ideogram/default.nix +++ b/pkgs/applications/graphics/ideogram/default.nix @@ -12,7 +12,7 @@ , pantheon , desktop-file-utils , xorg -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { vala pkg-config python3 - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/graphics/imagej/default.nix b/pkgs/applications/graphics/imagej/default.nix index b6396c231b19d..2398a61f2134b 100644 --- a/pkgs/applications/graphics/imagej/default.nix +++ b/pkgs/applications/graphics/imagej/default.nix @@ -7,7 +7,7 @@ , makeWrapper , makeDesktopItem , copyDesktopItems -, wrapGAppsHook +, wrapGAppsHook3 }: let @@ -23,7 +23,7 @@ in stdenv.mkDerivation rec { url = "https://wsr.imagej.net/distros/cross-platform/ij${version}.zip"; sha256 = "sha256-MGuUdUDuW3s/yGC68rHr6xxzmYScUjdXRawDpc1UQqw="; }; - nativeBuildInputs = [ copyDesktopItems makeWrapper unzip wrapGAppsHook ]; + nativeBuildInputs = [ copyDesktopItems makeWrapper unzip wrapGAppsHook3 ]; buildInputs = [ glib ]; dontWrapGApps = true; diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 35000a06de02e..358931534ad99 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -40,7 +40,7 @@ , potrace , python3 , substituteAll -, wrapGAppsHook +, wrapGAppsHook3 , libepoxy , zlib }: @@ -119,7 +119,7 @@ stdenv.mkDerivation rec { python3Env glib # for setup hook gdk-pixbuf # for setup hook - wrapGAppsHook + wrapGAppsHook3 gobject-introspection ] ++ (with perlPackages; [ perl diff --git a/pkgs/applications/graphics/inkscape/extensions/textext/default.nix b/pkgs/applications/graphics/inkscape/extensions/textext/default.nix index c3ad003cc1b2c..cb4be37759bcb 100644 --- a/pkgs/applications/graphics/inkscape/extensions/textext/default.nix +++ b/pkgs/applications/graphics/inkscape/extensions/textext/default.nix @@ -6,7 +6,7 @@ , pdflatex , lualatex , python3 -, wrapGAppsHook +, wrapGAppsHook3 , gobject-introspection , gtk3 , gtksourceview3 @@ -43,7 +43,7 @@ python3.pkgs.buildPythonApplication rec { ]; nativeBuildInputs = [ - wrapGAppsHook + wrapGAppsHook3 gobject-introspection ]; diff --git a/pkgs/applications/graphics/kgraphviewer/default.nix b/pkgs/applications/graphics/kgraphviewer/default.nix index 65ec4eb71d42e..20098eabeff48 100644 --- a/pkgs/applications/graphics/kgraphviewer/default.nix +++ b/pkgs/applications/graphics/kgraphviewer/default.nix @@ -1,4 +1,4 @@ -{ lib, mkDerivation, fetchurl, cmake, extra-cmake-modules, pkg-config, wrapGAppsHook +{ lib, mkDerivation, fetchurl, cmake, extra-cmake-modules, pkg-config, wrapGAppsHook3 , kconfig, kinit, kdoctools, kio, kparts, kwidgetsaddons , qtbase, qtsvg , boost, graphviz @@ -19,7 +19,7 @@ mkDerivation rec { ]; nativeBuildInputs = [ - cmake extra-cmake-modules pkg-config wrapGAppsHook + cmake extra-cmake-modules pkg-config wrapGAppsHook3 kdoctools ]; diff --git a/pkgs/applications/graphics/komorebi/default.nix b/pkgs/applications/graphics/komorebi/default.nix index 2d099b5eb7c96..261f451d07c2f 100644 --- a/pkgs/applications/graphics/komorebi/default.nix +++ b/pkgs/applications/graphics/komorebi/default.nix @@ -11,7 +11,7 @@ , clutter-gtk , clutter-gst , ninja -, wrapGAppsHook +, wrapGAppsHook3 , testers , komorebi }: @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { vala pkg-config ninja - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/graphics/kphotoalbum/default.nix b/pkgs/applications/graphics/kphotoalbum/default.nix index 6ff2f43399584..aa4bd7fd7e7e6 100644 --- a/pkgs/applications/graphics/kphotoalbum/default.nix +++ b/pkgs/applications/graphics/kphotoalbum/default.nix @@ -4,7 +4,7 @@ , lib , extra-cmake-modules , kdoctools -, wrapGAppsHook +, wrapGAppsHook3 , exiv2 , ffmpeg , libkdcraw @@ -38,7 +38,7 @@ mkDerivation rec { # be on the system anyway, so there is no real harm including it buildInputs = [ exiv2 phonon libvlc ]; - nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook3 ]; propagatedBuildInputs = [ kconfig kiconthemes kio kinit kpurpose libkdcraw ]; diff --git a/pkgs/applications/graphics/mypaint/default.nix b/pkgs/applications/graphics/mypaint/default.nix index 80067fa7c6c39..0d261b5e6034a 100644 --- a/pkgs/applications/graphics/mypaint/default.nix +++ b/pkgs/applications/graphics/mypaint/default.nix @@ -15,7 +15,7 @@ , pkg-config , python3 , swig -, wrapGAppsHook +, wrapGAppsHook3 }: let @@ -75,7 +75,7 @@ in buildPythonApplication rec { gettext pkg-config swig - wrapGAppsHook + wrapGAppsHook3 gobject-introspection # for setup hook hicolor-icon-theme # fór setup hook python3.pkgs.setuptools diff --git a/pkgs/applications/graphics/ocrfeeder/default.nix b/pkgs/applications/graphics/ocrfeeder/default.nix index d6243bdbffac3..7c30e81ab3e2d 100644 --- a/pkgs/applications/graphics/ocrfeeder/default.nix +++ b/pkgs/applications/graphics/ocrfeeder/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchurl , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , intltool , itstool , libxml2 @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkg-config - wrapGAppsHook + wrapGAppsHook3 intltool itstool libxml2 diff --git a/pkgs/applications/graphics/oculante/default.nix b/pkgs/applications/graphics/oculante/default.nix index 3c571a2adf768..a0c8da4705556 100644 --- a/pkgs/applications/graphics/oculante/default.nix +++ b/pkgs/applications/graphics/oculante/default.nix @@ -17,7 +17,7 @@ , gtk3 , darwin , perl -, wrapGAppsHook +, wrapGAppsHook3 }: rustPlatform.buildRustPackage rec { @@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec { pkg-config nasm perl - wrapGAppsHook + wrapGAppsHook3 ]; checkFlagsArray = [ "--skip=tests::net" ]; # requires network access diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix index e0ea00e5c2984..d72994e008b0b 100644 --- a/pkgs/applications/graphics/openscad/default.nix +++ b/pkgs/applications/graphics/openscad/default.nix @@ -29,7 +29,7 @@ , spacenavSupport ? stdenv.isLinux, libspnav , wayland , wayland-protocols -, wrapGAppsHook +, wrapGAppsHook3 , qtwayland , cairo }: @@ -58,7 +58,7 @@ mkDerivation rec { }) ]; - nativeBuildInputs = [ bison flex pkg-config gettext qmake wrapGAppsHook]; + nativeBuildInputs = [ bison flex pkg-config gettext qmake wrapGAppsHook3]; buildInputs = [ eigen boost glew opencsg cgal_4 mpfr gmp glib diff --git a/pkgs/applications/graphics/pencil/default.nix b/pkgs/applications/graphics/pencil/default.nix index 9924e0b58c148..4b7b6f9b6a478 100644 --- a/pkgs/applications/graphics/pencil/default.nix +++ b/pkgs/applications/graphics/pencil/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, lib, makeWrapper, wrapGAppsHook, +{ stdenv, fetchurl, lib, makeWrapper, wrapGAppsHook3, # build dependencies alsa-lib, atk, at-spi2-atk, at-spi2-core, cairo, cups, dbus, expat, fontconfig, freetype, gdk-pixbuf, glib, glibc, gtk3, libuuid, nspr, nss, pango, @@ -58,7 +58,7 @@ in stdenv.mkDerivation rec { dontBuild = true; - nativeBuildInputs = [ makeWrapper wrapGAppsHook ]; + nativeBuildInputs = [ makeWrapper wrapGAppsHook3 ]; buildInputs = deps; diff --git a/pkgs/applications/graphics/pick-colour-picker/default.nix b/pkgs/applications/graphics/pick-colour-picker/default.nix index bd9ab649d6338..fd736c3ec7ab8 100644 --- a/pkgs/applications/graphics/pick-colour-picker/default.nix +++ b/pkgs/applications/graphics/pick-colour-picker/default.nix @@ -6,7 +6,7 @@ , glib , gtk3 , gobject-introspection -, wrapGAppsHook +, wrapGAppsHook3 , python }: @@ -29,7 +29,7 @@ buildPythonPackage rec { nativeBuildInputs = [ gobject-introspection - wrapGAppsHook + wrapGAppsHook3 ]; pythonPath = [ diff --git a/pkgs/applications/graphics/pinta/default.nix b/pkgs/applications/graphics/pinta/default.nix index 2f523813a24b9..7f9c815eff1f6 100644 --- a/pkgs/applications/graphics/pinta/default.nix +++ b/pkgs/applications/graphics/pinta/default.nix @@ -5,7 +5,7 @@ , glibcLocales , gtk3 , intltool -, wrapGAppsHook +, wrapGAppsHook3 }: buildDotnetModule rec { @@ -14,7 +14,7 @@ buildDotnetModule rec { nativeBuildInputs = [ intltool - wrapGAppsHook + wrapGAppsHook3 ]; dotnet-sdk = dotnetCorePackages.sdk_7_0; diff --git a/pkgs/applications/graphics/pizarra/default.nix b/pkgs/applications/graphics/pizarra/default.nix index b53368439d756..6fd94f57e1e75 100644 --- a/pkgs/applications/graphics/pizarra/default.nix +++ b/pkgs/applications/graphics/pizarra/default.nix @@ -9,7 +9,7 @@ , glib , librsvg , gdk-pixbuf -, wrapGAppsHook +, wrapGAppsHook3 }: rustPlatform.buildRustPackage rec { @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-btvMUKADGHlXLmeKF1K9Js44SljZ0MejGId8aDwPhVU="; - nativeBuildInputs = [ wrapGAppsHook pkg-config gdk-pixbuf ]; + nativeBuildInputs = [ wrapGAppsHook3 pkg-config gdk-pixbuf ]; buildInputs = [ gtk3-x11 atk glib librsvg ]; diff --git a/pkgs/applications/graphics/processing/default.nix b/pkgs/applications/graphics/processing/default.nix index 5fa438ef975d8..d71ded259e831 100644 --- a/pkgs/applications/graphics/processing/default.nix +++ b/pkgs/applications/graphics/processing/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchurl, ant, unzip, makeWrapper, jdk, jogl, rsync, ffmpeg, batik, stripJavaArchivesHook, wrapGAppsHook, libGL }: +{ lib, stdenv, fetchFromGitHub, fetchurl, ant, unzip, makeWrapper, jdk, jogl, rsync, ffmpeg, batik, stripJavaArchivesHook, wrapGAppsHook3, libGL }: let buildNumber = "1293"; vaqua = fetchurl { @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-SzQemZ6iZ9o89/doV8YMv7DmyPSDyckJl3oyxJyfrm0="; }; - nativeBuildInputs = [ ant unzip makeWrapper stripJavaArchivesHook wrapGAppsHook ]; + nativeBuildInputs = [ ant unzip makeWrapper stripJavaArchivesHook wrapGAppsHook3 ]; buildInputs = [ jdk jogl ant rsync ffmpeg batik ]; dontWrapGApps = true; diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix index 2038b09dd822e..bf84ac1df11be 100644 --- a/pkgs/applications/graphics/rawtherapee/default.nix +++ b/pkgs/applications/graphics/rawtherapee/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , cmake , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , makeWrapper , pixman , libpthreadstubs @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config - wrapGAppsHook + wrapGAppsHook3 ] ++ lib.optionals stdenv.isDarwin [ makeWrapper ]; diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index df056d92fbe49..844878a34959d 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -27,7 +27,7 @@ , desktop-file-utils , gdk-pixbuf , librsvg -, wrapGAppsHook +, wrapGAppsHook3 , gobject-introspection , itstool , libsecret @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { itstool gettext desktop-file-utils - wrapGAppsHook + wrapGAppsHook3 gobject-introspection ]; diff --git a/pkgs/applications/graphics/shutter/default.nix b/pkgs/applications/graphics/shutter/default.nix index d10e8487796ff..9f18033fca487 100644 --- a/pkgs/applications/graphics/shutter/default.nix +++ b/pkgs/applications/graphics/shutter/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchFromGitHub , perlPackages -, wrapGAppsHook +, wrapGAppsHook3 , imagemagick , gdk-pixbuf , librsvg @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-o95skSr6rszh0wsHQTpu1GjqCDmde7aygIP+i4XQW9A="; }; - nativeBuildInputs = [ wrapGAppsHook ]; + nativeBuildInputs = [ wrapGAppsHook3 ]; buildInputs = [ perlPackages.perl procps diff --git a/pkgs/applications/graphics/snapshot/default.nix b/pkgs/applications/graphics/snapshot/default.nix index 88fc83f93c8b5..e449daac6dcc8 100644 --- a/pkgs/applications/graphics/snapshot/default.nix +++ b/pkgs/applications/graphics/snapshot/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "snapshot"; - version = "45.2"; + version = "46.2"; src = fetchurl { url = "mirror://gnome/sources/snapshot/${lib.versions.major finalAttrs.version}/snapshot-${finalAttrs.version}.tar.xz"; - hash = "sha256-iQd4F/xzXMjonbUWKPUuqKxmwZTfxqekLgA8TCnE3T4="; + hash = "sha256-Ef55oSuzQFHionnajB9FRYfQEaFPwkI35FTGT0S6z00="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/solvespace/default.nix b/pkgs/applications/graphics/solvespace/default.nix index e0605ad81e43f..610ef336a9e3f 100644 --- a/pkgs/applications/graphics/solvespace/default.nix +++ b/pkgs/applications/graphics/solvespace/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , cmake , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , at-spi2-core , cairo , dbus @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/graphics/synfigstudio/default.nix b/pkgs/applications/graphics/synfigstudio/default.nix index 34f9baad68041..858fef718aaa5 100644 --- a/pkgs/applications/graphics/synfigstudio/default.nix +++ b/pkgs/applications/graphics/synfigstudio/default.nix @@ -4,7 +4,7 @@ , fetchpatch , pkg-config , autoreconfHook -, wrapGAppsHook +, wrapGAppsHook3 , boost , cairo @@ -116,7 +116,7 @@ stdenv.mkDerivation { autoreconfHook gettext intltool - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ ETL diff --git a/pkgs/applications/graphics/tev/default.nix b/pkgs/applications/graphics/tev/default.nix index c1932c3e11c39..7447e549465aa 100644 --- a/pkgs/applications/graphics/tev/default.nix +++ b/pkgs/applications/graphics/tev/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, cmake, wrapGAppsHook +, cmake, wrapGAppsHook3 , libX11, libzip, glfw, libpng, xorg, gnome }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-+qCRHP0AbYOQBAE4zK2cmWPHZGWjjxC3DZPNm8sgBzs="; }; - nativeBuildInputs = [ cmake wrapGAppsHook ]; + nativeBuildInputs = [ cmake wrapGAppsHook3 ]; buildInputs = [ libX11 libzip glfw libpng ] ++ (with xorg; [ libXrandr libXinerama libXcursor libXi libXxf86vm libXext ]); diff --git a/pkgs/applications/graphics/xournalpp/default.nix b/pkgs/applications/graphics/xournalpp/default.nix index 54f7287513b1c..2c61584dae5ad 100644 --- a/pkgs/applications/graphics/xournalpp/default.nix +++ b/pkgs/applications/graphics/xournalpp/default.nix @@ -3,7 +3,7 @@ , cmake , gettext -, wrapGAppsHook +, wrapGAppsHook3 , pkg-config , alsa-lib @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { --replace-fail "addr2line" "${binutils}/bin/addr2line" ''; - nativeBuildInputs = [ cmake gettext pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ cmake gettext pkg-config wrapGAppsHook3 ]; buildInputs = lib.optionals stdenv.isLinux [ diff --git a/pkgs/applications/graphics/xpano/default.nix b/pkgs/applications/graphics/xpano/default.nix index 9842aca43dd8d..c4b43c5963fea 100644 --- a/pkgs/applications/graphics/xpano/default.nix +++ b/pkgs/applications/graphics/xpano/default.nix @@ -10,7 +10,7 @@ , catch2_3 , spdlog , exiv2 -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { cmake ninja pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/graphics/yed/default.nix b/pkgs/applications/graphics/yed/default.nix index 4e70c9d37aba4..7c6029312c8ca 100644 --- a/pkgs/applications/graphics/yed/default.nix +++ b/pkgs/applications/graphics/yed/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip, makeWrapper, unzip, jre, wrapGAppsHook }: +{ lib, stdenv, fetchzip, makeWrapper, unzip, jre, wrapGAppsHook3 }: stdenv.mkDerivation rec { pname = "yEd"; @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-u83OmIzq9VygKbfa886mj6BIa/9ET1btry2nR/wxeyI="; }; - nativeBuildInputs = [ makeWrapper unzip wrapGAppsHook ]; - # For wrapGAppsHook setup hook + nativeBuildInputs = [ makeWrapper unzip wrapGAppsHook3 ]; + # For wrapGAppsHook3 setup hook buildInputs = [ (jre.gtk3 or null) ]; dontConfigure = true; diff --git a/pkgs/applications/kde/audiotube.nix b/pkgs/applications/kde/audiotube.nix index bf1ec3099029b..c5a5da8550083 100644 --- a/pkgs/applications/kde/audiotube.nix +++ b/pkgs/applications/kde/audiotube.nix @@ -2,7 +2,7 @@ , mkDerivation , extra-cmake-modules -, wrapGAppsHook +, wrapGAppsHook3 , futuresql , gst_all_1 @@ -24,7 +24,7 @@ mkDerivation rec { nativeBuildInputs = [ extra-cmake-modules - wrapGAppsHook + wrapGAppsHook3 python3Packages.wrapPython python3Packages.pybind11 ]; diff --git a/pkgs/applications/kde/kasts.nix b/pkgs/applications/kde/kasts.nix index e0f00a1db2042..65e4d09409c7a 100644 --- a/pkgs/applications/kde/kasts.nix +++ b/pkgs/applications/kde/kasts.nix @@ -3,7 +3,7 @@ , cmake , extra-cmake-modules -, wrapGAppsHook +, wrapGAppsHook3 , gst_all_1 , kconfig @@ -29,7 +29,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake extra-cmake-modules - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/kde/kdenlive/default.nix b/pkgs/applications/kde/kdenlive/default.nix index 00330b76b3a00..85ccfb0f74083 100644 --- a/pkgs/applications/kde/kdenlive/default.nix +++ b/pkgs/applications/kde/kdenlive/default.nix @@ -33,7 +33,7 @@ , rttr , kpurpose , kdeclarative -, wrapGAppsHook +, wrapGAppsHook3 }: let @@ -79,7 +79,7 @@ mkDerivation { rttr kpurpose kdeclarative - wrapGAppsHook + wrapGAppsHook3 ]; # Both MLT and FFMpeg paths must be set or Kdenlive will complain that it # doesn't find them. See: diff --git a/pkgs/applications/kde/partitionmanager/default.nix b/pkgs/applications/kde/partitionmanager/default.nix index 90adde782c7fd..f65eb6d02b0ba 100644 --- a/pkgs/applications/kde/partitionmanager/default.nix +++ b/pkgs/applications/kde/partitionmanager/default.nix @@ -2,7 +2,7 @@ , lib , extra-cmake-modules , kdoctools -, wrapGAppsHook +, wrapGAppsHook3 , kconfig , kcrash , kinit @@ -67,7 +67,7 @@ in mkDerivation { pname = "partitionmanager"; - nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook3 ]; propagatedBuildInputs = [ kconfig kcrash kinit kpmcore polkit-qt ]; diff --git a/pkgs/applications/kde/plasmatube/default.nix b/pkgs/applications/kde/plasmatube/default.nix index cc83254cb2ac9..fbb577e6c80b7 100644 --- a/pkgs/applications/kde/plasmatube/default.nix +++ b/pkgs/applications/kde/plasmatube/default.nix @@ -1,7 +1,7 @@ { lib , mkDerivation , extra-cmake-modules -, wrapGAppsHook +, wrapGAppsHook3 , gst_all_1 , kcoreaddons , kdeclarative @@ -18,7 +18,7 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/kde/skanlite.nix b/pkgs/applications/kde/skanlite.nix index 2d2ca212d00cc..0c518cc8ca22b 100644 --- a/pkgs/applications/kde/skanlite.nix +++ b/pkgs/applications/kde/skanlite.nix @@ -1,6 +1,6 @@ { mkDerivation, lib, - wrapGAppsHook, + wrapGAppsHook3, extra-cmake-modules, kdoctools, kio, libksane }: @@ -15,6 +15,6 @@ mkDerivation { maintainers = with maintainers; [ polendri ]; }; - nativeBuildInputs = [ wrapGAppsHook extra-cmake-modules kdoctools ]; + nativeBuildInputs = [ wrapGAppsHook3 extra-cmake-modules kdoctools ]; buildInputs = [ kio libksane ]; } diff --git a/pkgs/applications/kde/spectacle.nix b/pkgs/applications/kde/spectacle.nix index f5471e2d10860..e628a49b81c5c 100644 --- a/pkgs/applications/kde/spectacle.nix +++ b/pkgs/applications/kde/spectacle.nix @@ -5,13 +5,13 @@ , knotifications, kscreen, kwidgetsaddons, kwindowsystem, kxmlgui, libkipi , qtx11extras, knewstuff, kwayland, qttools, kcolorpicker, kimageannotator , qcoro, qtquickcontrols2, wayland, plasma-wayland-protocols, kpurpose, kpipewire -, wrapGAppsHook +, wrapGAppsHook3 }: mkDerivation { pname = "spectacle"; - nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook3 ]; buildInputs = [ kconfig kcoreaddons kdbusaddons kdeclarative ki18n kio knotifications kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi qtx11extras xcb-util-cursor diff --git a/pkgs/applications/misc/1password-gui/linux.nix b/pkgs/applications/misc/1password-gui/linux.nix index 140adde918fc9..bfd9df01dbfac 100644 --- a/pkgs/applications/misc/1password-gui/linux.nix +++ b/pkgs/applications/misc/1password-gui/linux.nix @@ -5,7 +5,7 @@ , src , meta , makeShellWrapper -, wrapGAppsHook +, wrapGAppsHook3 , alsa-lib , at-spi2-atk , at-spi2-core @@ -49,7 +49,7 @@ let in stdenv.mkDerivation { inherit pname version src meta; - nativeBuildInputs = [ makeShellWrapper wrapGAppsHook ]; + nativeBuildInputs = [ makeShellWrapper wrapGAppsHook3 ]; buildInputs = [ glib ]; dontConfigure = true; diff --git a/pkgs/applications/misc/almanah/default.nix b/pkgs/applications/misc/almanah/default.nix index 48e663fe796c3..f98a569fe6031 100644 --- a/pkgs/applications/misc/almanah/default.nix +++ b/pkgs/applications/misc/almanah/default.nix @@ -22,7 +22,7 @@ , pkg-config , python3 , sqlite -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { ninja pkg-config python3 - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/misc/appeditor/default.nix b/pkgs/applications/misc/appeditor/default.nix index 508c59bab7c2d..46adf420932d2 100644 --- a/pkgs/applications/misc/appeditor/default.nix +++ b/pkgs/applications/misc/appeditor/default.nix @@ -11,7 +11,7 @@ , glib , gtk3 , libgee -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { vala pkg-config python3 - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/misc/auto-multiple-choice/default.nix b/pkgs/applications/misc/auto-multiple-choice/default.nix index bdd1e6fbb8540..c39430091e0d5 100644 --- a/pkgs/applications/misc/auto-multiple-choice/default.nix +++ b/pkgs/applications/misc/auto-multiple-choice/default.nix @@ -3,7 +3,7 @@ , fetchurl , perlPackages , makeWrapper -, wrapGAppsHook +, wrapGAppsHook3 , cairo , dblatex , gnumake @@ -99,7 +99,7 @@ stdenv.mkDerivation (finalAttrs: rec { nativeBuildInputs = [ pkg-config makeWrapper - wrapGAppsHook + wrapGAppsHook3 gobject-introspection ]; diff --git a/pkgs/applications/misc/avizo/default.nix b/pkgs/applications/misc/avizo/default.nix index 59021e92b0d87..77d942797abcd 100644 --- a/pkgs/applications/misc/avizo/default.nix +++ b/pkgs/applications/misc/avizo/default.nix @@ -13,7 +13,7 @@ , librsvg , gobject-introspection , gdk-pixbuf -, wrapGAppsHook +, wrapGAppsHook3 , pamixer , brightnessctl }: @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-Vj8OrNlAstl0AXTeVAPdEf5JgnAmJwl9s3Jdc0ZiYQc="; }; - nativeBuildInputs = [ meson ninja pkg-config vala gobject-introspection wrapGAppsHook ]; + nativeBuildInputs = [ meson ninja pkg-config vala gobject-introspection wrapGAppsHook3 ]; buildInputs = [ dbus dbus-glib gdk-pixbuf glib gtk-layer-shell gtk3 librsvg ]; diff --git a/pkgs/applications/misc/bambu-studio/default.nix b/pkgs/applications/misc/bambu-studio/default.nix index 43b6cb8769ef7..388b10f1356d5 100644 --- a/pkgs/applications/misc/bambu-studio/default.nix +++ b/pkgs/applications/misc/bambu-studio/default.nix @@ -8,7 +8,7 @@ fetchFromGitHub, cmake, pkg-config, - wrapGAppsHook, + wrapGAppsHook3, boost179, cereal, cgal_5, @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/misc/barrier/default.nix b/pkgs/applications/misc/barrier/default.nix index d02712848b72a..ee988b79f8219 100644 --- a/pkgs/applications/misc/barrier/default.nix +++ b/pkgs/applications/misc/barrier/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, cmake, curl, xorg, avahi, qtbase, mkDerivation, - openssl, wrapGAppsHook, + openssl, wrapGAppsHook3, avahiWithLibdnssdCompat ? avahi.override { withLibdnssdCompat = true; }, fetchpatch }: @@ -32,7 +32,7 @@ mkDerivation rec { ]; buildInputs = [ curl xorg.libX11 xorg.libXext xorg.libXtst avahiWithLibdnssdCompat qtbase ]; - nativeBuildInputs = [ cmake wrapGAppsHook ]; + nativeBuildInputs = [ cmake wrapGAppsHook3 ]; postFixup = '' substituteInPlace "$out/share/applications/barrier.desktop" --replace "Exec=barrier" "Exec=$out/bin/barrier" diff --git a/pkgs/applications/misc/bleachbit/default.nix b/pkgs/applications/misc/bleachbit/default.nix index c6e4adf8a560a..bb0e777186a28 100644 --- a/pkgs/applications/misc/bleachbit/default.nix +++ b/pkgs/applications/misc/bleachbit/default.nix @@ -3,7 +3,7 @@ , fetchurl , gettext , gobject-introspection -, wrapGAppsHook +, wrapGAppsHook3 , glib , gtk3 , libnotify @@ -23,7 +23,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ gettext gobject-introspection - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/misc/break-time/default.nix b/pkgs/applications/misc/break-time/default.nix index a4bbf4d4c104e..2b6263e3223e7 100644 --- a/pkgs/applications/misc/break-time/default.nix +++ b/pkgs/applications/misc/break-time/default.nix @@ -6,7 +6,7 @@ , python3 , rustPlatform , lib -, wrapGAppsHook +, wrapGAppsHook3 }: rustPlatform.buildRustPackage rec { @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config python3 # needed for Rust xcb package - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/misc/caerbannog/default.nix b/pkgs/applications/misc/caerbannog/default.nix index 0d21c7e165705..0ca33877d124f 100644 --- a/pkgs/applications/misc/caerbannog/default.nix +++ b/pkgs/applications/misc/caerbannog/default.nix @@ -6,7 +6,7 @@ , meson , ninja , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , gtk3 , atk , libhandy @@ -32,7 +32,7 @@ python3.pkgs.buildPythonApplication rec { meson ninja pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index ce72458f3a0f6..bdd8af4ebffed 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -26,7 +26,7 @@ , sqlite , wrapQtAppsHook , xdg-utils -, wrapGAppsHook +, wrapGAppsHook3 , unrarSupport ? false }: @@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: { pkg-config qmake removeReferencesTo - wrapGAppsHook + wrapGAppsHook3 wrapQtAppsHook ]; diff --git a/pkgs/applications/misc/cbatticon/default.nix b/pkgs/applications/misc/cbatticon/default.nix index 665957ca0ea1e..1221703006322 100644 --- a/pkgs/applications/misc/cbatticon/default.nix +++ b/pkgs/applications/misc/cbatticon/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, gettext, glib, gtk3, libnotify, wrapGAppsHook }: +{ lib, stdenv, fetchFromGitHub, pkg-config, gettext, glib, gtk3, libnotify, wrapGAppsHook3 }: stdenv.mkDerivation rec { pname = "cbatticon"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-VQjJujF9lnVvQxV+0YqodLgnI9F90JKDAGBu5nM/Q/c="; }; - nativeBuildInputs = [ pkg-config gettext wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config gettext wrapGAppsHook3 ]; buildInputs = [ glib gtk3 libnotify ]; diff --git a/pkgs/applications/misc/cherrytree/default.nix b/pkgs/applications/misc/cherrytree/default.nix index ffa44c63f96c4..48d382e284ff3 100644 --- a/pkgs/applications/misc/cherrytree/default.nix +++ b/pkgs/applications/misc/cherrytree/default.nix @@ -4,7 +4,7 @@ , cmake , pkg-config , python3 -, wrapGAppsHook +, wrapGAppsHook3 , gtkmm3 , gtksourceview , gtksourceviewmm @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { cmake pkg-config python3 - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/misc/cipher/default.nix b/pkgs/applications/misc/cipher/default.nix index 8486db6f7fc03..a51279c73a261 100644 --- a/pkgs/applications/misc/cipher/default.nix +++ b/pkgs/applications/misc/cipher/default.nix @@ -11,7 +11,7 @@ , glib , gtk3 , libgee -, wrapGAppsHook }: +, wrapGAppsHook3 }: stdenv.mkDerivation rec { pname = "cipher"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { vala pkg-config python3 - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/misc/clipit/default.nix b/pkgs/applications/misc/clipit/default.nix index b40bc4fec9303..0bd48d2adf63d 100644 --- a/pkgs/applications/misc/clipit/default.nix +++ b/pkgs/applications/misc/clipit/default.nix @@ -1,6 +1,6 @@ { fetchFromGitHub, lib, stdenv , autoreconfHook, intltool, pkg-config -, gtk3, libayatana-appindicator, xdotool, which, wrapGAppsHook }: +, gtk3, libayatana-appindicator, xdotool, which, wrapGAppsHook3 }: stdenv.mkDerivation rec { pname = "clipit"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { intltoolize --copy --force --automake ''; - nativeBuildInputs = [ pkg-config wrapGAppsHook autoreconfHook intltool ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook3 autoreconfHook intltool ]; configureFlags = [ "--with-gtk3" "--enable-appindicator=yes" ]; buildInputs = [ gtk3 libayatana-appindicator ]; diff --git a/pkgs/applications/misc/cobang/default.nix b/pkgs/applications/misc/cobang/default.nix index 336b4d7c1a507..15db663db99ee 100644 --- a/pkgs/applications/misc/cobang/default.nix +++ b/pkgs/applications/misc/cobang/default.nix @@ -19,7 +19,7 @@ , setuptools , python , pytestCheckHook -, wrapGAppsHook +, wrapGAppsHook3 }: buildPythonApplication rec { @@ -43,7 +43,7 @@ buildPythonApplication rec { nativeBuildInputs = [ # Needed to recognize gobject namespaces gobject-introspection - wrapGAppsHook + wrapGAppsHook3 setuptools ]; diff --git a/pkgs/applications/misc/cotp/default.nix b/pkgs/applications/misc/cotp/default.nix index 10ec807247397..38308f4daa409 100644 --- a/pkgs/applications/misc/cotp/default.nix +++ b/pkgs/applications/misc/cotp/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "cotp"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "replydev"; repo = "cotp"; rev = "v${version}"; - hash = "sha256-Zs/RUpyu8GG4koprC+8aSzpPUSLc19p/XinY5fR5Z4A="; + hash = "sha256-X3o3KgTHnhekdiSFdrCwLOrd0HKvCd8Z5jR2WpY1D6Q="; }; - cargoHash = "sha256-jYKu1sAzPUfv8gQj3V4zxarRj3XUhyD/5n1WqMuLF/g="; + cargoHash = "sha256-zaVNfgWXqHQaogGTaR1eE5u3gYU9SQ0nk0VO7NL5mvg="; buildInputs = lib.optionals stdenv.isLinux [ libxcb ] ++ lib.optionals stdenv.isDarwin [ AppKit ]; diff --git a/pkgs/applications/misc/diffuse/default.nix b/pkgs/applications/misc/diffuse/default.nix index 0f5cf3c0adc1c..a4a9e73db86ed 100644 --- a/pkgs/applications/misc/diffuse/default.nix +++ b/pkgs/applications/misc/diffuse/default.nix @@ -3,7 +3,7 @@ , meson , ninja , gettext -, wrapGAppsHook +, wrapGAppsHook3 , gobject-introspection , pango , gdk-pixbuf @@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication rec { format = "other"; nativeBuildInputs = [ - wrapGAppsHook + wrapGAppsHook3 meson ninja gettext diff --git a/pkgs/applications/misc/dockbarx/default.nix b/pkgs/applications/misc/dockbarx/default.nix index 3b147bdcc3604..815a482a216f3 100644 --- a/pkgs/applications/misc/dockbarx/default.nix +++ b/pkgs/applications/misc/dockbarx/default.nix @@ -6,7 +6,7 @@ , keybinder3 , libwnck , python3Packages -, wrapGAppsHook +, wrapGAppsHook3 }: python3Packages.buildPythonApplication rec { @@ -24,7 +24,7 @@ python3Packages.buildPythonApplication rec { glib.dev gobject-introspection python3Packages.polib - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/misc/fbmenugen/default.nix b/pkgs/applications/misc/fbmenugen/default.nix index 90d3f3b014248..56a3ce5f28dd1 100644 --- a/pkgs/applications/misc/fbmenugen/default.nix +++ b/pkgs/applications/misc/fbmenugen/default.nix @@ -6,7 +6,7 @@ , perlPackages , substituteAll , xorg -, wrapGAppsHook +, wrapGAppsHook3 , gitUpdater }: @@ -33,7 +33,7 @@ perlPackages.buildPerlPackage rec { nativeBuildInputs = [ makeWrapper - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/misc/feedbackd/default.nix b/pkgs/applications/misc/feedbackd/default.nix index 45da9c1afaa8c..f0d90a495c771 100644 --- a/pkgs/applications/misc/feedbackd/default.nix +++ b/pkgs/applications/misc/feedbackd/default.nix @@ -12,7 +12,7 @@ , ninja , pkg-config , vala -, wrapGAppsHook +, wrapGAppsHook3 , glib , gsound , json-glib @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { ninja pkg-config vala - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/misc/findex/default.nix b/pkgs/applications/misc/findex/default.nix index 29ddc3d461a4c..8af4fc35d7de8 100644 --- a/pkgs/applications/misc/findex/default.nix +++ b/pkgs/applications/misc/findex/default.nix @@ -2,7 +2,7 @@ , rustPlatform , fetchFromGitHub , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , keybinder3 }: @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { --replace-fail '/opt/findex/style.css' "$out/share/findex/style.css" ''; - nativeBuildInputs = [ pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook3 ]; buildInputs = [ keybinder3 ]; diff --git a/pkgs/applications/misc/fluxboxlauncher/default.nix b/pkgs/applications/misc/fluxboxlauncher/default.nix index 19e70ad7c54cf..7172ce535071a 100644 --- a/pkgs/applications/misc/fluxboxlauncher/default.nix +++ b/pkgs/applications/misc/fluxboxlauncher/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , python3 , gtk3 -, wrapGAppsHook +, wrapGAppsHook3 , glibcLocales , gobject-introspection , gettext @@ -24,7 +24,7 @@ python3.pkgs.buildPythonApplication rec { }; nativeBuildInputs = [ - wrapGAppsHook + wrapGAppsHook3 gobject-introspection pango gdk-pixbuf diff --git a/pkgs/applications/misc/font-manager/default.nix b/pkgs/applications/misc/font-manager/default.nix index 309d8fa2faf5d..9568c0c929b0a 100644 --- a/pkgs/applications/misc/font-manager/default.nix +++ b/pkgs/applications/misc/font-manager/default.nix @@ -16,7 +16,7 @@ , gtk3 , gnome , desktop-file-utils -, wrapGAppsHook +, wrapGAppsHook3 , gobject-introspection # withWebkit enables the "webkit" feature, also known as Google Fonts , withWebkit ? true, glib-networking, libsoup, webkitgtk @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { desktop-file-utils vala yelp-tools - wrapGAppsHook + wrapGAppsHook3 # For https://github.com/FontManager/master/blob/master/lib/unicode/meson.build gobject-introspection ]; diff --git a/pkgs/applications/misc/fontfinder/default.nix b/pkgs/applications/misc/fontfinder/default.nix index f0fc3dfd3a7d7..db55b02065265 100644 --- a/pkgs/applications/misc/fontfinder/default.nix +++ b/pkgs/applications/misc/fontfinder/default.nix @@ -5,7 +5,7 @@ , pkg-config , rustPlatform , rustc -, wrapGAppsHook +, wrapGAppsHook3 , gdk-pixbuf , gtk3 , libsoup_3 @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { pkg-config rustPlatform.cargoSetupHook rustc - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/misc/formatter/default.nix b/pkgs/applications/misc/formatter/default.nix index f53ea0f030ca7..8f5c4c9c6b322 100644 --- a/pkgs/applications/misc/formatter/default.nix +++ b/pkgs/applications/misc/formatter/default.nix @@ -16,7 +16,7 @@ , hfsprogs , ntfs3g , libgee -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { vala pkg-config python3 - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/misc/foxtrotgps/default.nix b/pkgs/applications/misc/foxtrotgps/default.nix index 745a2357e2362..bb9049dde7919 100644 --- a/pkgs/applications/misc/foxtrotgps/default.nix +++ b/pkgs/applications/misc/foxtrotgps/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchbzr, autoreconfHook, texinfo, help2man, imagemagick, pkg-config -, curl, gnome2, gpsd, gtk2, wrapGAppsHook +, curl, gnome2, gpsd, gtk2, wrapGAppsHook3 , intltool, libexif, python3Packages, sqlite }: let @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config autoreconfHook texinfo help2man - imagemagick wrapGAppsHook intltool + imagemagick wrapGAppsHook3 intltool ]; buildInputs = [ diff --git a/pkgs/applications/misc/gImageReader/default.nix b/pkgs/applications/misc/gImageReader/default.nix index bc293b455b2a8..8aa564fc780bb 100644 --- a/pkgs/applications/misc/gImageReader/default.nix +++ b/pkgs/applications/misc/gImageReader/default.nix @@ -6,7 +6,7 @@ # Gtk deps # upstream gImagereader supports Qt too -, gobject-introspection, wrapGAppsHook +, gobject-introspection, wrapGAppsHook3 , gtkmm3, gtksourceview3, gtksourceviewmm, gtkspell3, gtkspellmm, cairomm }: @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { pythonEnv # Gtk specific - wrapGAppsHook + wrapGAppsHook3 gobject-introspection ]; diff --git a/pkgs/applications/misc/gcstar/default.nix b/pkgs/applications/misc/gcstar/default.nix index 0f6478f50fcd2..02662f11f96b4 100644 --- a/pkgs/applications/misc/gcstar/default.nix +++ b/pkgs/applications/misc/gcstar/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchFromGitLab , perlPackages -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-37yjKI4l/nUzDnra1AGxDQxNafMsLi1bSifG6pz33zg="; }; - nativeBuildInputs = [ wrapGAppsHook ]; + nativeBuildInputs = [ wrapGAppsHook3 ]; buildInputs = with perlPackages; [ perl diff --git a/pkgs/applications/misc/genxword/default.nix b/pkgs/applications/misc/genxword/default.nix index 5ba67ecddcdb1..199a63f967198 100644 --- a/pkgs/applications/misc/genxword/default.nix +++ b/pkgs/applications/misc/genxword/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , gettext , gobject-introspection -, wrapGAppsHook +, wrapGAppsHook3 , pango , gtksourceview3 }: @@ -22,7 +22,7 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = [ gettext gobject-introspection - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/misc/gkrellm/default.nix b/pkgs/applications/misc/gkrellm/default.nix index 523ba837f3a10..218110f6d17de 100644 --- a/pkgs/applications/misc/gkrellm/default.nix +++ b/pkgs/applications/misc/gkrellm/default.nix @@ -12,7 +12,7 @@ , IOKit , copyDesktopItems , makeDesktopItem -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { sha256 = "01lccz4fga40isv09j8rjgr0qy10rff9vj042n6gi6gdv4z69q0y"; }; - nativeBuildInputs = [ copyDesktopItems pkg-config which wrapGAppsHook ]; + nativeBuildInputs = [ copyDesktopItems pkg-config which wrapGAppsHook3 ]; buildInputs = [ gettext glib gtk2 libX11 libSM libICE ] ++ lib.optionals stdenv.isDarwin [ IOKit ]; diff --git a/pkgs/applications/misc/glom/default.nix b/pkgs/applications/misc/glom/default.nix index 5c8eb94712a68..67618ed083f56 100644 --- a/pkgs/applications/misc/glom/default.nix +++ b/pkgs/applications/misc/glom/default.nix @@ -31,7 +31,7 @@ , postgresql_15 , gobject-introspection , yelp-tools -, wrapGAppsHook +, wrapGAppsHook3 }: let @@ -70,7 +70,7 @@ in stdenv.mkDerivation rec { doxygen graphviz sphinx-build - wrapGAppsHook + wrapGAppsHook3 gobject-introspection # for setup hook ]; diff --git a/pkgs/applications/misc/gmtp/default.nix b/pkgs/applications/misc/gmtp/default.nix index 31c62f53423c4..dc5111c2a7222 100644 --- a/pkgs/applications/misc/gmtp/default.nix +++ b/pkgs/applications/misc/gmtp/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, libmtp, libid3tag, flac, libvorbis, gtk3 -, gsettings-desktop-schemas, wrapGAppsHook +, gsettings-desktop-schemas, wrapGAppsHook3 }: let version = "1.3.11"; in @@ -13,7 +13,7 @@ stdenv.mkDerivation { sha256 = "04q6byyq002fhzkc2rkkahwh5b6272xakaj4m3vwm8la8jf0r0ss"; }; - nativeBuildInputs = [ pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook3 ]; buildInputs = [ libmtp libid3tag flac libvorbis gtk3 gsettings-desktop-schemas ]; enableParallelBuilding = true; diff --git a/pkgs/applications/misc/gnome-multi-writer/default.nix b/pkgs/applications/misc/gnome-multi-writer/default.nix index 0a37cadb8e2cb..f73016681c0ee 100644 --- a/pkgs/applications/misc/gnome-multi-writer/default.nix +++ b/pkgs/applications/misc/gnome-multi-writer/default.nix @@ -12,7 +12,7 @@ , meson , ninja , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , polkit , udisks }: @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meson ninja pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/misc/gnome-recipes/default.nix b/pkgs/applications/misc/gnome-recipes/default.nix index d1680cdbaee2b..ecc6413fe0f19 100644 --- a/pkgs/applications/misc/gnome-recipes/default.nix +++ b/pkgs/applications/misc/gnome-recipes/default.nix @@ -8,7 +8,7 @@ , gettext , itstool , python3 -, wrapGAppsHook +, wrapGAppsHook3 , gtk3 , glib , libsoup @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { gettext itstool python3 - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/misc/gnome-tecla/default.nix b/pkgs/applications/misc/gnome-tecla/default.nix index 43f77763f1291..c1a3183086be4 100644 --- a/pkgs/applications/misc/gnome-tecla/default.nix +++ b/pkgs/applications/misc/gnome-tecla/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "tecla"; - version = "45.0"; + version = "46.0"; src = fetchurl { url = "mirror://gnome/sources/tecla/${lib.versions.major finalAttrs.version}/tecla-${finalAttrs.version}.tar.xz"; - hash = "sha256-XAK7QBmxz/tWY9phB1A+/4U4Nqh4PdRwXdBKSfetwls="; + hash = "sha256-Sggeq4Z6WosJdYmRytdkWSDzI6q8qVRAgpD7b0RZGw8="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/gnome-usage/default.nix b/pkgs/applications/misc/gnome-usage/default.nix index c969c92ffdd2e..85d7f36d2014c 100644 --- a/pkgs/applications/misc/gnome-usage/default.nix +++ b/pkgs/applications/misc/gnome-usage/default.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "gnome-usage"; - version = "45.0"; + version = "46.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "5nfE/iwBSXqE/x4RV+kTHp+ZmfGnjTUjSvHXfYJ18pQ="; + hash = "sha256-GGrajgAYjIn4yrVPNZmO2XpG6rb9shiRAoNhvzhqybI="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/goldendict-ng/default.nix b/pkgs/applications/misc/goldendict-ng/default.nix index 5d86aece035da..1693c8a12dd51 100644 --- a/pkgs/applications/misc/goldendict-ng/default.nix +++ b/pkgs/applications/misc/goldendict-ng/default.nix @@ -26,7 +26,7 @@ , qtmultimedia , qtspeech , wrapQtAppsHook -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation (finalAttrs: { @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-+OiZEkhNV06fZXPXv9zDzgJS5M3isHlcOXee3p/ejpw="; }; - nativeBuildInputs = [ pkg-config cmake wrapQtAppsHook wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config cmake wrapQtAppsHook wrapGAppsHook3 ]; buildInputs = [ qtbase qtsvg diff --git a/pkgs/applications/misc/goldendict/default.nix b/pkgs/applications/misc/goldendict/default.nix index a339e399e33d6..4f5df502fdfcd 100644 --- a/pkgs/applications/misc/goldendict/default.nix +++ b/pkgs/applications/misc/goldendict/default.nix @@ -2,7 +2,7 @@ , libXtst, libvorbis, hunspell, lzo, xz, bzip2, libiconv , qtbase, qtsvg, qtwebkit, qtx11extras, qttools, qmake , wrapQtAppsHook -, wrapGAppsHook +, wrapGAppsHook3 , withCC ? true, opencc , withEpwing ? true, libeb , withExtraTiff ? true, libtiff @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { --replace "opencc.2" "opencc" ''; - nativeBuildInputs = [ pkg-config qmake wrapQtAppsHook wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config qmake wrapQtAppsHook wrapGAppsHook3 ]; buildInputs = [ qtbase qtsvg qtwebkit qttools libvorbis hunspell xz lzo diff --git a/pkgs/applications/misc/gpx-viewer/default.nix b/pkgs/applications/misc/gpx-viewer/default.nix index 9a18c9d5c9d97..daaf92fc72de2 100644 --- a/pkgs/applications/misc/gpx-viewer/default.nix +++ b/pkgs/applications/misc/gpx-viewer/default.nix @@ -10,7 +10,7 @@ , gnome , libchamplain , gdl -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ninja pkg-config vala - wrapGAppsHook # Fix error: GLib-GIO-ERROR **: No GSettings schemas are installed on the system + wrapGAppsHook3 # Fix error: GLib-GIO-ERROR **: No GSettings schemas are installed on the system ]; buildInputs = [ diff --git a/pkgs/applications/misc/gramps/default.nix b/pkgs/applications/misc/gramps/default.nix index fdfcfe4ce3160..7feab95b003a1 100644 --- a/pkgs/applications/misc/gramps/default.nix +++ b/pkgs/applications/misc/gramps/default.nix @@ -7,7 +7,7 @@ , gexiv2 , pango , gobject-introspection -, wrapGAppsHook +, wrapGAppsHook3 , gettext # Optional packages: , enableOSM ? true @@ -44,7 +44,7 @@ buildPythonApplication rec { ]; nativeBuildInputs = [ - wrapGAppsHook + wrapGAppsHook3 intltool gettext gobject-introspection diff --git a/pkgs/applications/misc/grsync/default.nix b/pkgs/applications/misc/grsync/default.nix index da41a71d95eab..0e0a6cb87eebc 100644 --- a/pkgs/applications/misc/grsync/default.nix +++ b/pkgs/applications/misc/grsync/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, dee, gtk3, intltool, libdbusmenu-gtk3, libunity, pkg-config, rsync, wrapGAppsHook }: +{ lib, stdenv, fetchurl, dee, gtk3, intltool, libdbusmenu-gtk3, libunity, pkg-config, rsync, wrapGAppsHook3 }: stdenv.mkDerivation rec { version = "1.3.1"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ intltool pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/misc/gummi/default.nix b/pkgs/applications/misc/gummi/default.nix index 7131c5cd12275..857db4fd95bfd 100644 --- a/pkgs/applications/misc/gummi/default.nix +++ b/pkgs/applications/misc/gummi/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, pkgs , glib, gtk3, gtksourceview3, gtkspell3, poppler, texlive -, pkg-config, intltool, autoreconfHook, wrapGAppsHook +, pkg-config, intltool, autoreconfHook, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkg-config intltool autoreconfHook wrapGAppsHook + pkg-config intltool autoreconfHook wrapGAppsHook3 ]; buildInputs = [ glib gtksourceview3 gtk3 gtkspell3 poppler diff --git a/pkgs/applications/misc/hamster/default.nix b/pkgs/applications/misc/hamster/default.nix index c425014e24ed8..bdab5d71e9ef2 100644 --- a/pkgs/applications/misc/hamster/default.nix +++ b/pkgs/applications/misc/hamster/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, python3Packages, intltool, glib, itstool, gtk3 -, wrapGAppsHook, gobject-introspection, pango, gdk-pixbuf, atk, wafHook }: +, wrapGAppsHook3, gobject-introspection, pango, gdk-pixbuf, atk, wafHook }: python3Packages.buildPythonApplication rec { pname = "hamster"; @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ python3Packages.setuptools - wrapGAppsHook + wrapGAppsHook3 intltool itstool wafHook diff --git a/pkgs/applications/misc/hcl2json/default.nix b/pkgs/applications/misc/hcl2json/default.nix index 40bfede8551fc..39073ee81b0fd 100644 --- a/pkgs/applications/misc/hcl2json/default.nix +++ b/pkgs/applications/misc/hcl2json/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "hcl2json"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "tmccombs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-lnmWIyS1byXvShR1/ej8PAuo+WJBEBykQwJ79439Fus="; + sha256 = "sha256-RBzx6TxkR6GwMGHIpkJeswZ3zV4hRf38rTGUO6u2OI4="; }; - vendorHash = "sha256-HbdectUQgyQZ9qcfBarwRTF3VjzSqaM2vhVekThv2+k="; + vendorHash = "sha256-G/2bSFCXbph0bVjmWmcFgv4i/pCOQHhYxsVRVkpHPo4="; subPackages = [ "." ]; diff --git a/pkgs/applications/misc/holochain-launcher/default.nix b/pkgs/applications/misc/holochain-launcher/default.nix index 111a36e3ee02a..3d7c6b6c205be 100644 --- a/pkgs/applications/misc/holochain-launcher/default.nix +++ b/pkgs/applications/misc/holochain-launcher/default.nix @@ -7,7 +7,7 @@ , openssl , webkitgtk , libappindicator -, wrapGAppsHook +, wrapGAppsHook3 , shared-mime-info , glib-networking }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoPatchelfHook dpkg - wrapGAppsHook # required for FileChooser + wrapGAppsHook3 # required for FileChooser ]; buildInputs = [ diff --git a/pkgs/applications/misc/input-leap/default.nix b/pkgs/applications/misc/input-leap/default.nix index 567bb08fb911d..9f40735771fc5 100644 --- a/pkgs/applications/misc/input-leap/default.nix +++ b/pkgs/applications/misc/input-leap/default.nix @@ -21,7 +21,7 @@ , pkg-config , qtbase , qttools -, wrapGAppsHook +, wrapGAppsHook3 }: mkDerivation rec { @@ -36,7 +36,7 @@ mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ pkg-config cmake wrapGAppsHook qttools ]; + nativeBuildInputs = [ pkg-config cmake wrapGAppsHook3 qttools ]; buildInputs = [ curl qtbase avahi libX11 libXext libXtst libXinerama libXrandr libXdmcp libICE libSM diff --git a/pkgs/applications/misc/keepassxc/default.nix b/pkgs/applications/misc/keepassxc/default.nix index e74a45c02f311..e8804f6009464 100644 --- a/pkgs/applications/misc/keepassxc/default.nix +++ b/pkgs/applications/misc/keepassxc/default.nix @@ -20,7 +20,7 @@ , qtsvg , qtx11extras , readline -, wrapGAppsHook +, wrapGAppsHook3 , wrapQtAppsHook , zlib @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { qttools pkg-config ] - ++ lib.optional (!stdenv.isDarwin) wrapGAppsHook; + ++ lib.optional (!stdenv.isDarwin) wrapGAppsHook3; dontWrapGApps = true; preFixup = '' diff --git a/pkgs/applications/misc/keeweb/default.nix b/pkgs/applications/misc/keeweb/default.nix index 22f3ad668ccbf..a7260dc509b72 100644 --- a/pkgs/applications/misc/keeweb/default.nix +++ b/pkgs/applications/misc/keeweb/default.nix @@ -4,7 +4,7 @@ , undmg , dpkg , autoPatchelfHook -, wrapGAppsHook +, wrapGAppsHook3 , makeWrapper , alsa-lib , at-spi2-atk @@ -92,7 +92,7 @@ else stdenv.mkDerivation { nativeBuildInputs = [ autoPatchelfHook - wrapGAppsHook + wrapGAppsHook3 makeWrapper ]; diff --git a/pkgs/applications/misc/keymapp/default.nix b/pkgs/applications/misc/keymapp/default.nix index 55cc3f3f9810f..59dae9589fa7a 100644 --- a/pkgs/applications/misc/keymapp/default.nix +++ b/pkgs/applications/misc/keymapp/default.nix @@ -2,7 +2,7 @@ , lib , fetchurl , autoPatchelfHook -, wrapGAppsHook +, wrapGAppsHook3 , libusb1 , webkitgtk , gtk3 @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ copyDesktopItems autoPatchelfHook - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/misc/keystore-explorer/default.nix b/pkgs/applications/misc/keystore-explorer/default.nix index fb5990f5dca0b..d5576ccb725e7 100644 --- a/pkgs/applications/misc/keystore-explorer/default.nix +++ b/pkgs/applications/misc/keystore-explorer/default.nix @@ -1,4 +1,4 @@ -{ fetchzip, lib, stdenv, jdk, runtimeShell, glib, wrapGAppsHook }: +{ fetchzip, lib, stdenv, jdk, runtimeShell, glib, wrapGAppsHook3 }: stdenv.mkDerivation rec { version = "5.5.3"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { # glib is necessary so file dialogs don't hang. buildInputs = [ glib ]; - nativeBuildInputs = [ wrapGAppsHook ]; + nativeBuildInputs = [ wrapGAppsHook3 ]; installPhase = '' runHook preInstall diff --git a/pkgs/applications/misc/klipperscreen/default.nix b/pkgs/applications/misc/klipperscreen/default.nix index 789ab7c688287..5364d090f75d2 100644 --- a/pkgs/applications/misc/klipperscreen/default.nix +++ b/pkgs/applications/misc/klipperscreen/default.nix @@ -1,7 +1,7 @@ { lib , python3 , fetchFromGitHub -, wrapGAppsHook +, wrapGAppsHook3 , gobject-introspection , gitUpdater }: python3.pkgs.buildPythonApplication rec { @@ -18,7 +18,7 @@ nativeBuildInputs = [ gobject-introspection - wrapGAppsHook + wrapGAppsHook3 ]; pythonPath = with python3.pkgs; [ diff --git a/pkgs/applications/misc/krename/default.nix b/pkgs/applications/misc/krename/default.nix index 98ba8836efca7..6cc5df92ae727 100644 --- a/pkgs/applications/misc/krename/default.nix +++ b/pkgs/applications/misc/krename/default.nix @@ -1,6 +1,6 @@ { mkDerivation, fetchurl, fetchpatch, lib, - extra-cmake-modules, kdoctools, wrapGAppsHook, + extra-cmake-modules, kdoctools, wrapGAppsHook3, kconfig, kinit, kjsembed, taglib, exiv2, podofo, kcrash }: @@ -27,7 +27,7 @@ in mkDerivation rec { buildInputs = [ taglib exiv2 podofo ]; - nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook3 ]; propagatedBuildInputs = [ kconfig kcrash kinit kjsembed ]; diff --git a/pkgs/applications/misc/kupfer/default.nix b/pkgs/applications/misc/kupfer/default.nix index fbb33c7e096fe..8c22612ad452c 100644 --- a/pkgs/applications/misc/kupfer/default.nix +++ b/pkgs/applications/misc/kupfer/default.nix @@ -9,7 +9,7 @@ , keybinder3 , desktop-file-utils , shared-mime-info -, wrapGAppsHook +, wrapGAppsHook3 , wafHook , bash , dbus @@ -29,7 +29,7 @@ buildPythonApplication rec { }; nativeBuildInputs = [ - wrapGAppsHook intltool + wrapGAppsHook3 intltool # For setup hook gobject-introspection wafHook itstool # for help pages diff --git a/pkgs/applications/misc/lutris/default.nix b/pkgs/applications/misc/lutris/default.nix index 3ee6148ef16b9..b16acc4787b78 100644 --- a/pkgs/applications/misc/lutris/default.nix +++ b/pkgs/applications/misc/lutris/default.nix @@ -15,7 +15,7 @@ , libnotify , pango , webkitgtk -, wrapGAppsHook +, wrapGAppsHook3 # check inputs , xvfb-run @@ -85,7 +85,7 @@ buildPythonApplication rec { hash = "sha256-Ed1bhugBe97XmY050A5jCPcnLj0Fd7qPX2p/Ab+YbOE="; }; - nativeBuildInputs = [ wrapGAppsHook gobject-introspection ]; + nativeBuildInputs = [ wrapGAppsHook3 gobject-introspection ]; buildInputs = [ atk gdk-pixbuf diff --git a/pkgs/applications/misc/mako/default.nix b/pkgs/applications/misc/mako/default.nix index ca7849c566a98..8c4e37661a8c6 100644 --- a/pkgs/applications/misc/mako/default.nix +++ b/pkgs/applications/misc/mako/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, scdoc , systemd, pango, cairo, gdk-pixbuf, jq, bash , wayland, wayland-protocols -, wrapGAppsHook }: +, wrapGAppsHook3 }: stdenv.mkDerivation rec { pname = "mako"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; depsBuildBuild = [ pkg-config ]; - nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-protocols wrapGAppsHook ]; + nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-protocols wrapGAppsHook3 ]; buildInputs = [ systemd pango cairo gdk-pixbuf wayland ]; mesonFlags = [ diff --git a/pkgs/applications/misc/maliit-keyboard/default.nix b/pkgs/applications/misc/maliit-keyboard/default.nix index 3669dfe5a5b7b..c67ac7a402fc9 100644 --- a/pkgs/applications/misc/maliit-keyboard/default.nix +++ b/pkgs/applications/misc/maliit-keyboard/default.nix @@ -17,7 +17,7 @@ , cmake , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 }: mkDerivation rec { @@ -58,7 +58,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; postInstall = '' diff --git a/pkgs/applications/misc/markets/default.nix b/pkgs/applications/misc/markets/default.nix index 436891482f19b..e24e902abc036 100644 --- a/pkgs/applications/misc/markets/default.nix +++ b/pkgs/applications/misc/markets/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub , desktop-file-utils, glib, gtk3, meson, ninja, pkg-config, python3, vala -, wrapGAppsHook +, wrapGAppsHook3 , glib-networking, gobject-introspection, json-glib, libgee, libhandy, libsoup }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ desktop-file-utils glib gtk3 meson ninja pkg-config python3 vala - wrapGAppsHook gobject-introspection + wrapGAppsHook3 gobject-introspection ]; buildInputs = [ glib glib-networking gtk3 json-glib libgee libhandy diff --git a/pkgs/applications/misc/meerk40t/default.nix b/pkgs/applications/misc/meerk40t/default.nix index c1a0b41a58ac4..e0a3921824de2 100644 --- a/pkgs/applications/misc/meerk40t/default.nix +++ b/pkgs/applications/misc/meerk40t/default.nix @@ -3,7 +3,7 @@ , meerk40t-camera , python3Packages , gtk3 -, wrapGAppsHook +, wrapGAppsHook3 }: python3Packages.buildPythonApplication rec { @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { }; nativeBuildInputs = [ - wrapGAppsHook + wrapGAppsHook3 ] ++ (with python3Packages; [ setuptools ]); diff --git a/pkgs/applications/misc/minder/default.nix b/pkgs/applications/misc/minder/default.nix index a02647f4a9fbc..e4e58d9bf6c3e 100644 --- a/pkgs/applications/misc/minder/default.nix +++ b/pkgs/applications/misc/minder/default.nix @@ -8,7 +8,7 @@ , python3 , shared-mime-info , vala -, wrapGAppsHook +, wrapGAppsHook3 , cairo , discount , glib @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { python3 shared-mime-info vala - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/misc/minigalaxy/default.nix b/pkgs/applications/misc/minigalaxy/default.nix index ad694c01cdcba..aa31ffa5cc2b0 100644 --- a/pkgs/applications/misc/minigalaxy/default.nix +++ b/pkgs/applications/misc/minigalaxy/default.nix @@ -11,7 +11,7 @@ , steam-run , unzip , webkitgtk -, wrapGAppsHook +, wrapGAppsHook3 }: python3Packages.buildPythonApplication rec { @@ -33,7 +33,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ gettext - wrapGAppsHook + wrapGAppsHook3 gobject-introspection ]; diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix index 92574896bbd97..caecc46d5432c 100644 --- a/pkgs/applications/misc/mysql-workbench/default.nix +++ b/pkgs/applications/misc/mysql-workbench/default.nix @@ -35,7 +35,7 @@ , cairo , libxkbcommon , libepoxy -, wrapGAppsHook +, wrapGAppsHook3 , at-spi2-core , dbus , bash @@ -98,7 +98,7 @@ stdenv.mkDerivation (finalAttrs: { pkg-config jre swig - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/misc/notifymuch/default.nix b/pkgs/applications/misc/notifymuch/default.nix index 6ba819133eccf..72a0485b0a7ee 100644 --- a/pkgs/applications/misc/notifymuch/default.nix +++ b/pkgs/applications/misc/notifymuch/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , gobject-introspection , libnotify -, wrapGAppsHook +, wrapGAppsHook3 , gtk3 , python3 }: @@ -30,7 +30,7 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = [ gobject-introspection - wrapGAppsHook + wrapGAppsHook3 ]; dontWrapGApps = true; diff --git a/pkgs/applications/misc/ns-usbloader/default.nix b/pkgs/applications/misc/ns-usbloader/default.nix index 2a08b24435a28..8ab52711a6cee 100644 --- a/pkgs/applications/misc/ns-usbloader/default.nix +++ b/pkgs/applications/misc/ns-usbloader/default.nix @@ -4,7 +4,7 @@ , copyDesktopItems , makeDesktopItem , makeWrapper -, wrapGAppsHook +, wrapGAppsHook3 , gvfs , maven , jre @@ -42,7 +42,7 @@ maven.buildMavenPackage rec { nativeBuildInputs = [ copyDesktopItems makeWrapper - wrapGAppsHook + wrapGAppsHook3 gvfs ]; diff --git a/pkgs/applications/misc/numberstation/default.nix b/pkgs/applications/misc/numberstation/default.nix index 7a1393637dffd..651e4420280df 100644 --- a/pkgs/applications/misc/numberstation/default.nix +++ b/pkgs/applications/misc/numberstation/default.nix @@ -10,7 +10,7 @@ , meson , ninja , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 }: python3.pkgs.buildPythonApplication rec { @@ -38,7 +38,7 @@ python3.pkgs.buildPythonApplication rec { meson ninja pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/misc/nwg-bar/default.nix b/pkgs/applications/misc/nwg-bar/default.nix index 356b1edb15aeb..d80986db6e030 100644 --- a/pkgs/applications/misc/nwg-bar/default.nix +++ b/pkgs/applications/misc/nwg-bar/default.nix @@ -5,7 +5,7 @@ , pkg-config , gtk3 , gtk-layer-shell -, wrapGAppsHook }: +, wrapGAppsHook3 }: buildGoModule rec { pname = "nwg-bar"; @@ -26,7 +26,7 @@ buildGoModule rec { vendorHash = "sha256-/kqhZcIuoN/XA0i1ua3lzVGn4ghkekFYScL1o3kgBX4="; - nativeBuildInputs = [ pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook3 ]; buildInputs = [ gtk3 gtk-layer-shell librsvg ]; diff --git a/pkgs/applications/misc/nwg-displays/default.nix b/pkgs/applications/misc/nwg-displays/default.nix index 22d4e20d5eef7..e014100f45c57 100644 --- a/pkgs/applications/misc/nwg-displays/default.nix +++ b/pkgs/applications/misc/nwg-displays/default.nix @@ -7,7 +7,7 @@ , gtk3 , pango , python310Packages -, wrapGAppsHook +, wrapGAppsHook3 , hyprlandSupport ? true , wlr-randr }: @@ -25,7 +25,7 @@ python310Packages.buildPythonApplication rec { nativeBuildInputs = [ gobject-introspection - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/misc/nwg-dock-hyprland/default.nix b/pkgs/applications/misc/nwg-dock-hyprland/default.nix index 607dd7c22facf..19003c66a6755 100644 --- a/pkgs/applications/misc/nwg-dock-hyprland/default.nix +++ b/pkgs/applications/misc/nwg-dock-hyprland/default.nix @@ -2,7 +2,7 @@ , buildGoModule , fetchFromGitHub , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , gtk-layer-shell }: @@ -21,7 +21,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" ]; - nativeBuildInputs = [ pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook3 ]; buildInputs = [ gtk-layer-shell ]; meta = with lib; { diff --git a/pkgs/applications/misc/nwg-menu/default.nix b/pkgs/applications/misc/nwg-menu/default.nix index 6733a5dac3f4d..27be9aa08fa9e 100644 --- a/pkgs/applications/misc/nwg-menu/default.nix +++ b/pkgs/applications/misc/nwg-menu/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub -, buildGoModule, pkg-config, wrapGAppsHook, gobject-introspection +, buildGoModule, pkg-config, wrapGAppsHook3, gobject-introspection , gtk-layer-shell, gtk3, pango, gdk-pixbuf, atk }: @@ -19,7 +19,7 @@ buildGoModule rec { doCheck = false; buildInputs = [ atk gtk3 gdk-pixbuf gtk-layer-shell pango ]; - nativeBuildInputs = [ pkg-config wrapGAppsHook gobject-introspection ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook3 gobject-introspection ]; prePatch = '' for file in main.go tools.go; do diff --git a/pkgs/applications/misc/nwg-panel/default.nix b/pkgs/applications/misc/nwg-panel/default.nix index 840b048d2d4cd..064fead047334 100644 --- a/pkgs/applications/misc/nwg-panel/default.nix +++ b/pkgs/applications/misc/nwg-panel/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub -, python3Packages, wrapGAppsHook, gobject-introspection +, python3Packages, wrapGAppsHook3, gobject-introspection , gtk-layer-shell, pango, gdk-pixbuf, atk # Extra packages called by various internal nwg-panel modules , hyprland # hyprctl @@ -28,12 +28,12 @@ python3Packages.buildPythonApplication rec { # No tests doCheck = false; - # Because of wrapGAppsHook + # Because of wrapGAppsHook3 strictDeps = false; dontWrapGApps = true; buildInputs = [ atk gdk-pixbuf gtk-layer-shell pango playerctl ]; - nativeBuildInputs = [ wrapGAppsHook gobject-introspection ]; + nativeBuildInputs = [ wrapGAppsHook3 gobject-introspection ]; propagatedBuildInputs = (with python3Packages; [ i3ipc netifaces psutil pybluez pygobject3 requests dasbus setuptools ]) # Run-time GTK dependency required by the Tray module diff --git a/pkgs/applications/misc/nwg-wrapper/default.nix b/pkgs/applications/misc/nwg-wrapper/default.nix index 5b28628318961..f5b524c890198 100644 --- a/pkgs/applications/misc/nwg-wrapper/default.nix +++ b/pkgs/applications/misc/nwg-wrapper/default.nix @@ -1,4 +1,4 @@ -{ lib, python3Packages, fetchFromGitHub, gtk-layer-shell, gtk3, gobject-introspection, wrapGAppsHook, wlr-randr }: +{ lib, python3Packages, fetchFromGitHub, gtk-layer-shell, gtk3, gobject-introspection, wrapGAppsHook3, wlr-randr }: python3Packages.buildPythonPackage rec { pname = "nwg-wrapper"; @@ -11,7 +11,7 @@ python3Packages.buildPythonPackage rec { sha256 = "sha256-GKDAdjO67aedCEFHKDukQ+oPMomTPwFE/CvJu112fus="; }; - nativeBuildInputs = [ gobject-introspection wrapGAppsHook ]; + nativeBuildInputs = [ gobject-introspection wrapGAppsHook3 ]; buildInputs = [ gtk3 gtk-layer-shell ]; diff --git a/pkgs/applications/misc/onboard/default.nix b/pkgs/applications/misc/onboard/default.nix index cdcdb2b1e5149..6f210791ce9af 100644 --- a/pkgs/applications/misc/onboard/default.nix +++ b/pkgs/applications/misc/onboard/default.nix @@ -23,7 +23,7 @@ , pkg-config , procps , python3 -, wrapGAppsHook +, wrapGAppsHook3 , xorg , yelp }: @@ -60,7 +60,7 @@ python3.pkgs.buildPythonApplication rec { gobject-introspection intltool pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/misc/openlp/default.nix b/pkgs/applications/misc/openlp/default.nix index a075a9bec6f5f..c77b494f08cac 100644 --- a/pkgs/applications/misc/openlp/default.nix +++ b/pkgs/applications/misc/openlp/default.nix @@ -1,6 +1,6 @@ # This file contains all runtime glue: Bindings to optional runtime dependencies # for pdfSupport, presentationSupport, and media playback. -{ lib, mkDerivation, wrapGAppsHook, python3Packages +{ lib, mkDerivation, wrapGAppsHook3, python3Packages # qt deps , qtbase, qtmultimedia @@ -40,7 +40,7 @@ in mkDerivation { pname = baseLib.pname + lib.optionalString (pdfSupport && presentationSupport && vlcSupport && gstreamerSupport) "-full"; inherit (baseLib) version src; - nativeBuildInputs = [ python3Packages.wrapPython wrapGAppsHook ]; + nativeBuildInputs = [ python3Packages.wrapPython wrapGAppsHook3 ]; buildInputs = [ qtbase ] ++ optionals gstreamerSupport ([ qtmultimedia.bin gst_all_1.gstreamer ] ++ gstPlugins gst_all_1); propagatedBuildInputs = optional pdfSupport mupdf diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix deleted file mode 100644 index dcb578dd56789..0000000000000 --- a/pkgs/applications/misc/orca/default.nix +++ /dev/null @@ -1,116 +0,0 @@ -{ lib -, pkg-config -, fetchurl -, buildPythonApplication -, autoreconfHook -, wrapGAppsHook -, gobject-introspection -, gettext -, yelp-tools -, itstool -, python -, pygobject3 -, gtk3 -, gnome -, substituteAll -, at-spi2-atk -, at-spi2-core -, pyatspi -, dbus -, dbus-python -, pyxdg -, xkbcomp -, procps -, lsof -, coreutils -, gsettings-desktop-schemas -, speechd -, brltty -, liblouis -, setproctitle -, gst_all_1 -, gst-python -}: - -buildPythonApplication rec { - pname = "orca"; - version = "45.2"; - - format = "other"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "8PLFeaW+7f5WU7x/4kSBxNaqxd0fccHnoghZXzx473Y="; - }; - - patches = [ - (substituteAll { - src = ./fix-paths.patch; - cat = "${coreutils}/bin/cat"; - lsof = "${lsof}/bin/lsof"; - pgrep = "${procps}/bin/pgrep"; - xkbcomp = "${xkbcomp}/bin/xkbcomp"; - }) - ]; - - nativeBuildInputs = [ - autoreconfHook - wrapGAppsHook - pkg-config - gettext - yelp-tools - itstool - gobject-introspection - ]; - - pythonPath = [ - pygobject3 - pyatspi - dbus-python - pyxdg - brltty - liblouis - speechd - gst-python - setproctitle - ]; - - strictDeps = false; - - buildInputs = [ - python - gtk3 - at-spi2-atk - at-spi2-core - dbus - gsettings-desktop-schemas - gst_all_1.gstreamer - gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-good - ]; - - passthru = { - updateScript = gnome.updateScript { - packageName = pname; - }; - }; - - meta = with lib; { - homepage = "https://orca.gnome.org/"; - description = "Screen reader"; - mainProgram = "orca"; - longDescription = '' - A free, open source, flexible and extensible screen reader that provides - access to the graphical desktop via speech and refreshable braille. - It works with applications and toolkits that support the Assistive - Technology Service Provider Interface (AT-SPI). That includes the GNOME - GTK toolkit, the Java platform's Swing toolkit, LibreOffice, Gecko, and - WebKitGtk. AT-SPI support for the KDE Qt toolkit is being pursued. - - Needs `services.gnome.at-spi2-core.enable = true;` in `configuration.nix`. - ''; - maintainers = with maintainers; [ berce ] ++ teams.gnome.members; - license = licenses.lgpl21; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/misc/orca/fix-paths.patch b/pkgs/applications/misc/orca/fix-paths.patch deleted file mode 100644 index 45ae4b827ba59..0000000000000 --- a/pkgs/applications/misc/orca/fix-paths.patch +++ /dev/null @@ -1,88 +0,0 @@ -diff --git a/src/orca/debug.py b/src/orca/debug.py -index b7e11ea60..9ab996765 100644 ---- a/src/orca/debug.py -+++ b/src/orca/debug.py -@@ -447,7 +447,7 @@ def traceit(frame, event, arg): - return traceit - - def getOpenFDCount(pid): -- procs = subprocess.check_output([ 'lsof', '-w', '-Ff', '-p', str(pid)]) -+ procs = subprocess.check_output([ '@lsof@', '-w', '-Ff', '-p', str(pid)]) - procs = procs.decode('UTF-8').split('\n') - files = list(filter(lambda s: s and s[0] == 'f' and s[1:].isdigit(), procs)) - -@@ -465,7 +465,7 @@ def getCmdline(pid): - return cmdline - - def pidOf(procName): -- openFile = subprocess.Popen(f'pgrep {procName}', -+ openFile = subprocess.Popen(f'@pgrep@ {procName}', - shell=True, - stdout=subprocess.PIPE).stdout - pids = openFile.read() -diff --git a/src/orca/orca.py b/src/orca/orca.py -index d4e89f918..bb3e6cc1d 100644 ---- a/src/orca/orca.py -+++ b/src/orca/orca.py -@@ -312,7 +312,7 @@ def updateKeyMap(keyboardEvent): - - def _setXmodmap(xkbmap): - """Set the keyboard map using xkbcomp.""" -- p = subprocess.Popen(['xkbcomp', '-w0', '-', os.environ['DISPLAY']], -+ p = subprocess.Popen(['@xkbcomp@', '-w0', '-', os.environ['DISPLAY']], - stdin=subprocess.PIPE, stdout=None, stderr=None) - p.communicate(xkbmap) - -@@ -389,7 +389,7 @@ def _storeXmodmap(keyList): - """ - - global _originalXmodmap -- _originalXmodmap = subprocess.check_output(['xkbcomp', os.environ['DISPLAY'], '-']) -+ _originalXmodmap = subprocess.check_output(['@xkbcomp@', os.environ['DISPLAY'], '-']) - - def _restoreXmodmap(keyList=[]): - """Restore the original xmodmap values for the keys in keyList. -@@ -404,7 +404,7 @@ def _restoreXmodmap(keyList=[]): - - global _capsLockCleared - _capsLockCleared = False -- p = subprocess.Popen(['xkbcomp', '-w0', '-', os.environ['DISPLAY']], -+ p = subprocess.Popen(['@xkbcomp@', '-w0', '-', os.environ['DISPLAY']], - stdin=subprocess.PIPE, stdout=None, stderr=None) - p.communicate(_originalXmodmap) - -diff --git a/src/orca/orca_bin.py.in b/src/orca/orca_bin.py.in -index 9d64af948..ca9c9e083 100644 ---- a/src/orca/orca_bin.py.in -+++ b/src/orca/orca_bin.py.in -@@ -65,7 +65,7 @@ class ListApps(argparse.Action): - name = "[DEAD]" - - try: -- cmdline = subprocess.getoutput('cat /proc/%s/cmdline' % pid) -+ cmdline = subprocess.getoutput('@cat@ /proc/%s/cmdline' % pid) - except Exception: - cmdline = '(exception encountered)' - else: -@@ -198,7 +198,7 @@ def inGraphicalDesktop(): - def otherOrcas(): - """Returns the pid of any other instances of Orca owned by this user.""" - -- openFile = subprocess.Popen('pgrep -u %s -x orca' % os.getuid(), -+ openFile = subprocess.Popen('@pgrep@ -u %s -x orca' % os.getuid(), - shell=True, - stdout=subprocess.PIPE).stdout - pids = openFile.read() -diff --git a/src/orca/script_utilities.py b/src/orca/script_utilities.py -index ed8b155e4..0436cca42 100644 ---- a/src/orca/script_utilities.py -+++ b/src/orca/script_utilities.py -@@ -144,7 +144,7 @@ class Utilities: - return "" - - try: -- cmdline = subprocess.getoutput(f"cat /proc/{pid}/cmdline") -+ cmdline = subprocess.getoutput(f"@cat@ /proc/{pid}/cmdline") - except Exception: - return "" - diff --git a/pkgs/applications/misc/otpclient/default.nix b/pkgs/applications/misc/otpclient/default.nix index e53cc20874ba6..0ab84ea083720 100644 --- a/pkgs/applications/misc/otpclient/default.nix +++ b/pkgs/applications/misc/otpclient/default.nix @@ -4,7 +4,7 @@ , cmake , pkg-config , gtk3 -, wrapGAppsHook +, wrapGAppsHook3 , jansson , libgcrypt , libzip @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/misc/oversteer/default.nix b/pkgs/applications/misc/oversteer/default.nix index eb47b4225d87d..6618d154cdda5 100644 --- a/pkgs/applications/misc/oversteer/default.nix +++ b/pkgs/applications/misc/oversteer/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, pkg-config, gettext, python3, python3Packages , meson, ninja, udev, appstream, appstream-glib, desktop-file-utils, gtk3 -, wrapGAppsHook, gobject-introspection, bash, }: +, wrapGAppsHook3, gobject-introspection, bash, }: let python = python3.withPackages (p: with p; [ @@ -33,7 +33,7 @@ in stdenv.mkDerivation { pkg-config gettext python - wrapGAppsHook + wrapGAppsHook3 gobject-introspection meson udev diff --git a/pkgs/applications/misc/pattypan/default.nix b/pkgs/applications/misc/pattypan/default.nix index c1f5aa84b0eb5..344540e848635 100644 --- a/pkgs/applications/misc/pattypan/default.nix +++ b/pkgs/applications/misc/pattypan/default.nix @@ -4,7 +4,7 @@ , ant , jdk , makeWrapper -, wrapGAppsHook +, wrapGAppsHook3 , makeDesktopItem , copyDesktopItems , stripJavaArchivesHook @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { ant jdk makeWrapper - wrapGAppsHook + wrapGAppsHook3 copyDesktopItems stripJavaArchivesHook ]; diff --git a/pkgs/applications/misc/pdf-quench/default.nix b/pkgs/applications/misc/pdf-quench/default.nix index 78151061700aa..bfb240e2b9d21 100644 --- a/pkgs/applications/misc/pdf-quench/default.nix +++ b/pkgs/applications/misc/pdf-quench/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, pkgs, python3, wrapGAppsHook, gobject-introspection }: +{ lib, fetchFromGitHub, pkgs, python3, wrapGAppsHook3, gobject-introspection }: python3.pkgs.buildPythonApplication { pname = "pdf-quench"; @@ -11,7 +11,7 @@ python3.pkgs.buildPythonApplication { sha256 = "1rp9rlwr6rarcsxygv5x2c5psgwl6r69k0lsgribgyyla9cf2m7n"; }; - nativeBuildInputs = [ wrapGAppsHook gobject-introspection ]; + nativeBuildInputs = [ wrapGAppsHook3 gobject-introspection ]; buildInputs = with pkgs; [ gtk3 goocanvas2 diff --git a/pkgs/applications/misc/pdfarranger/default.nix b/pkgs/applications/misc/pdfarranger/default.nix index 2973a4b9a36cd..7e0dc4c2fdb2c 100644 --- a/pkgs/applications/misc/pdfarranger/default.nix +++ b/pkgs/applications/misc/pdfarranger/default.nix @@ -1,6 +1,6 @@ { fetchFromGitHub , lib -, wrapGAppsHook +, wrapGAppsHook3 , python3Packages , gtk3 , poppler_gi @@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec { }; nativeBuildInputs = [ - wrapGAppsHook + wrapGAppsHook3 ] ++ (with python3Packages; [ setuptools ]); @@ -39,7 +39,7 @@ python3Packages.buildPythonApplication rec { python-dateutil ]; - # incompatible with wrapGAppsHook + # incompatible with wrapGAppsHook3 strictDeps = false; dontWrapGApps = true; preFixup = '' diff --git a/pkgs/applications/misc/pdfpc/default.nix b/pkgs/applications/misc/pdfpc/default.nix index 7d46836b796e4..5b77a264ed2bf 100644 --- a/pkgs/applications/misc/pdfpc/default.nix +++ b/pkgs/applications/misc/pdfpc/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config, vala, gtk3, libgee -, poppler, libpthreadstubs, gstreamer, gst-plugins-base, gst-plugins-good, gst-libav, gobject-introspection, wrapGAppsHook +, poppler, libpthreadstubs, gstreamer, gst-plugins-base, gst-plugins-good, gst-libav, gobject-introspection, wrapGAppsHook3 , qrencode, webkitgtk, discount, json-glib, fetchpatch }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { cmake pkg-config vala # For setup hook gobject-introspection - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/misc/pdfsam-basic/default.nix b/pkgs/applications/misc/pdfsam-basic/default.nix index c7d88edef8678..ce3ce1a740120 100644 --- a/pkgs/applications/misc/pdfsam-basic/default.nix +++ b/pkgs/applications/misc/pdfsam-basic/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, makeDesktopItem, fetchurl, jdk21, wrapGAppsHook, glib }: +{ lib, stdenv, makeDesktopItem, fetchurl, jdk21, wrapGAppsHook3, glib }: stdenv.mkDerivation rec { pname = "pdfsam-basic"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { tar xvf data.tar.gz ''; - nativeBuildInputs = [ wrapGAppsHook ]; + nativeBuildInputs = [ wrapGAppsHook3 ]; buildInputs = [ glib ]; preFixup = '' diff --git a/pkgs/applications/misc/pdfslicer/default.nix b/pkgs/applications/misc/pdfslicer/default.nix index ed20f460a1677..d856dfaca8cb3 100644 --- a/pkgs/applications/misc/pdfslicer/default.nix +++ b/pkgs/applications/misc/pdfslicer/default.nix @@ -5,7 +5,7 @@ , gettext , intltool , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , gtkmm3 , libuuid , poppler @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { gettext intltool pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/misc/phoc/default.nix b/pkgs/applications/misc/phoc/default.nix index deccbabe3fd47..d999744bdb89f 100644 --- a/pkgs/applications/misc/phoc/default.nix +++ b/pkgs/applications/misc/phoc/default.nix @@ -6,7 +6,7 @@ , ninja , pkg-config , python3 -, wrapGAppsHook +, wrapGAppsHook3 , libinput , gnome , gnome-desktop @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { ninja pkg-config python3 - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/misc/plank/default.nix b/pkgs/applications/misc/plank/default.nix index fb3226e6d8030..69be975be0ba2 100644 --- a/pkgs/applications/misc/plank/default.nix +++ b/pkgs/applications/misc/plank/default.nix @@ -21,7 +21,7 @@ , file , gnome-menus , libgee -, wrapGAppsHook +, wrapGAppsHook3 , autoreconfHook }: @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { libxml2 # xmllint pkg-config vala - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/misc/playonlinux/default.nix b/pkgs/applications/misc/playonlinux/default.nix index 0b4f445c00669..4f12fb470671e 100644 --- a/pkgs/applications/misc/playonlinux/default.nix +++ b/pkgs/applications/misc/playonlinux/default.nix @@ -26,7 +26,7 @@ # needed for avoiding crash on file selector , gsettings-desktop-schemas , glib -, wrapGAppsHook +, wrapGAppsHook3 , hicolor-icon-theme }: @@ -79,7 +79,7 @@ in stdenv.mkDerivation { ./0001-fix-locale.patch ]; - nativeBuildInputs = [ makeWrapper wrapGAppsHook ]; + nativeBuildInputs = [ makeWrapper wrapGAppsHook3 ]; preBuild = '' makeFlagsArray+=(PYTHON="python -m py_compile") diff --git a/pkgs/applications/misc/polar-bookshelf/default.nix b/pkgs/applications/misc/polar-bookshelf/default.nix index 983dc81d1790d..1e29c225f92c4 100644 --- a/pkgs/applications/misc/polar-bookshelf/default.nix +++ b/pkgs/applications/misc/polar-bookshelf/default.nix @@ -3,7 +3,7 @@ , makeWrapper , fetchurl , dpkg -, wrapGAppsHook +, wrapGAppsHook3 , autoPatchelfHook , gtk3 , cairo @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - wrapGAppsHook + wrapGAppsHook3 autoPatchelfHook makeWrapper dpkg diff --git a/pkgs/applications/misc/polar-bookshelf1/default.nix b/pkgs/applications/misc/polar-bookshelf1/default.nix index a4ff885a71b8a..572a981b4ccf8 100644 --- a/pkgs/applications/misc/polar-bookshelf1/default.nix +++ b/pkgs/applications/misc/polar-bookshelf1/default.nix @@ -36,7 +36,7 @@ , nss , openssl , pango -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { autoPatchelfHook dpkg makeWrapper - wrapGAppsHook + wrapGAppsHook3 ]; runtimeLibs = lib.makeLibraryPath [ libudev0-shim glibc curl openssl libnghttp2 ]; diff --git a/pkgs/applications/misc/polychromatic/default.nix b/pkgs/applications/misc/polychromatic/default.nix index f940f5a4af803..9ed291c79c7eb 100644 --- a/pkgs/applications/misc/polychromatic/default.nix +++ b/pkgs/applications/misc/polychromatic/default.nix @@ -10,7 +10,7 @@ , sassc , python3Packages , gobject-introspection -, wrapGAppsHook +, wrapGAppsHook3 , libappindicator-gtk3 , libxcb , qt5 @@ -48,7 +48,7 @@ python3Packages.buildPythonApplication rec { meson ninja sassc - wrapGAppsHook + wrapGAppsHook3 qt5.wrapQtAppsHook ]; diff --git a/pkgs/applications/misc/premid/default.nix b/pkgs/applications/misc/premid/default.nix index f621d510e411d..876c4c33de28e 100644 --- a/pkgs/applications/misc/premid/default.nix +++ b/pkgs/applications/misc/premid/default.nix @@ -1,4 +1,4 @@ -{ autoPatchelfHook, makeDesktopItem, lib, stdenv, wrapGAppsHook, fetchurl, copyDesktopItems +{ autoPatchelfHook, makeDesktopItem, lib, stdenv, wrapGAppsHook3, fetchurl, copyDesktopItems , alsa-lib, at-spi2-atk, at-spi2-core, atk, cairo, cups, dbus, expat, fontconfig , freetype, gdk-pixbuf, glib, gtk3, libcxx, libdrm, libnotify, libpulseaudio, libuuid , libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoPatchelfHook - wrapGAppsHook + wrapGAppsHook3 copyDesktopItems ]; diff --git a/pkgs/applications/misc/printrun/default.nix b/pkgs/applications/misc/printrun/default.nix index 61acdd32857cb..884ce49dd8347 100644 --- a/pkgs/applications/misc/printrun/default.nix +++ b/pkgs/applications/misc/printrun/default.nix @@ -1,4 +1,4 @@ -{ lib, python3Packages, fetchFromGitHub, glib, wrapGAppsHook }: +{ lib, python3Packages, fetchFromGitHub, glib, wrapGAppsHook3 }: python3Packages.buildPythonApplication rec { pname = "printrun"; @@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec { sed -i -r "s|/usr(/local)?/share/|$out/share/|g" printrun/utils.py ''; - nativeBuildInputs = [ glib wrapGAppsHook ]; + nativeBuildInputs = [ glib wrapGAppsHook3 ]; propagatedBuildInputs = with python3Packages; [ appdirs cython dbus-python numpy six wxpython psutil pyglet pyopengl pyserial cffi cairosvg lxml diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix index 7952eadea68fa..b1e2a80617bae 100644 --- a/pkgs/applications/misc/prusa-slicer/default.nix +++ b/pkgs/applications/misc/prusa-slicer/default.nix @@ -4,7 +4,7 @@ , fetchFromGitHub , cmake , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , boost , cereal , cgal @@ -78,7 +78,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/misc/pytrainer/default.nix b/pkgs/applications/misc/pytrainer/default.nix index 6d907fab0db46..49be94cc2baba 100644 --- a/pkgs/applications/misc/pytrainer/default.nix +++ b/pkgs/applications/misc/pytrainer/default.nix @@ -13,7 +13,7 @@ , sqlite , tzdata , webkitgtk -, wrapGAppsHook +, wrapGAppsHook3 , xvfb-run }: @@ -48,7 +48,7 @@ in python.pkgs.buildPythonApplication rec { nativeBuildInputs = [ gobject-introspection - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/misc/qtpass/default.nix b/pkgs/applications/misc/qtpass/default.nix index ae26de760ee6d..d401a57dda78a 100644 --- a/pkgs/applications/misc/qtpass/default.nix +++ b/pkgs/applications/misc/qtpass/default.nix @@ -23,9 +23,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ qmake qttools wrapQtAppsHook ]; - # HACK `propagatedSandboxProfile` does not appear to actually propagate the sandbox profile from `qt5.qtbase` - sandboxProfile = toString qtbase.__propagatedSandboxProfile; - qmakeFlags = [ # setup hook only sets QMAKE_LRELEASE, set QMAKE_LUPDATE too: "QMAKE_LUPDATE=${qttools.dev}/bin/lupdate" diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix index ff0ba6c0edb7a..f0c46f8c207a8 100644 --- a/pkgs/applications/misc/redshift/default.nix +++ b/pkgs/applications/misc/redshift/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, fetchFromGitLab , autoconf, automake, gettext, intltool -, libtool, pkg-config, wrapGAppsHook, wrapPython, gobject-introspection +, libtool, pkg-config, wrapGAppsHook3, wrapPython, gobject-introspection , gtk3, python, pygobject3, pyxdg , withQuartz ? stdenv.isDarwin, ApplicationServices @@ -33,7 +33,7 @@ let intltool libtool pkg-config - wrapGAppsHook + wrapGAppsHook3 wrapPython gobject-introspection python diff --git a/pkgs/applications/misc/regextester/default.nix b/pkgs/applications/misc/regextester/default.nix index 05daa180d0297..902ae57492011 100644 --- a/pkgs/applications/misc/regextester/default.nix +++ b/pkgs/applications/misc/regextester/default.nix @@ -13,7 +13,7 @@ , gsettings-desktop-schemas , desktop-file-utils , pantheon -, wrapGAppsHook }: +, wrapGAppsHook3 }: stdenv.mkDerivation rec { pname = "regextester"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meson ninja pkg-config - wrapGAppsHook + wrapGAppsHook3 desktop-file-utils ]; diff --git a/pkgs/applications/misc/remontoire/default.nix b/pkgs/applications/misc/remontoire/default.nix index 0aabaababf6a5..754d32617e789 100644 --- a/pkgs/applications/misc/remontoire/default.nix +++ b/pkgs/applications/misc/remontoire/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchFromGitHub -, wrapGAppsHook +, wrapGAppsHook3 , desktop-file-utils , glib , gtk3 @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { pkg-config python3 vala - wrapGAppsHook + wrapGAppsHook3 desktop-file-utils ]; diff --git a/pkgs/applications/misc/rofi-top/default.nix b/pkgs/applications/misc/rofi-top/default.nix index 328eca9da894f..877cbd6a284ef 100644 --- a/pkgs/applications/misc/rofi-top/default.nix +++ b/pkgs/applications/misc/rofi-top/default.nix @@ -8,7 +8,7 @@ , libgtop , pkg-config , rofi-unwrapped -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { autoreconfHook gobject-introspection pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/misc/rofi/wrapper.nix b/pkgs/applications/misc/rofi/wrapper.nix index 2f98fe164161b..f8da5074b52aa 100644 --- a/pkgs/applications/misc/rofi/wrapper.nix +++ b/pkgs/applications/misc/rofi/wrapper.nix @@ -1,4 +1,4 @@ -{ symlinkJoin, lib, rofi-unwrapped, makeWrapper, wrapGAppsHook, gdk-pixbuf, hicolor-icon-theme, theme ? null, plugins ? [], symlink-dmenu ? false }: +{ symlinkJoin, lib, rofi-unwrapped, makeWrapper, wrapGAppsHook3, gdk-pixbuf, hicolor-icon-theme, theme ? null, plugins ? [], symlink-dmenu ? false }: symlinkJoin { name = "rofi-${rofi-unwrapped.version}"; @@ -7,7 +7,7 @@ symlinkJoin { rofi-unwrapped.out ] ++ (lib.forEach plugins (p: p.out)); - nativeBuildInputs = [ makeWrapper wrapGAppsHook ]; + nativeBuildInputs = [ makeWrapper wrapGAppsHook3 ]; buildInputs = [ gdk-pixbuf ]; preferLocalBuild = true; diff --git a/pkgs/applications/misc/rootbar/default.nix b/pkgs/applications/misc/rootbar/default.nix index 41582e1b413c2..2ef92f1c9aa21 100644 --- a/pkgs/applications/misc/rootbar/default.nix +++ b/pkgs/applications/misc/rootbar/default.nix @@ -7,7 +7,7 @@ , json_c , libpulseaudio , wayland -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - meson ninja pkg-config wrapGAppsHook + meson ninja pkg-config wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/misc/safeeyes/default.nix b/pkgs/applications/misc/safeeyes/default.nix index 39bb82aaaef6d..87925d732e89a 100644 --- a/pkgs/applications/misc/safeeyes/default.nix +++ b/pkgs/applications/misc/safeeyes/default.nix @@ -11,7 +11,7 @@ , testers , xprintidle , xprop -, wrapGAppsHook +, wrapGAppsHook3 }: with python3.pkgs; @@ -30,7 +30,7 @@ buildPythonApplication rec { ''; nativeBuildInputs = [ - wrapGAppsHook + wrapGAppsHook3 gobject-introspection ]; diff --git a/pkgs/applications/misc/sequeler/default.nix b/pkgs/applications/misc/sequeler/default.nix index 49fa61270b4d2..aa76a65a17523 100644 --- a/pkgs/applications/misc/sequeler/default.nix +++ b/pkgs/applications/misc/sequeler/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, nix-update-script -, vala, meson, ninja, pkg-config, pantheon, gettext, wrapGAppsHook, python3, desktop-file-utils +, vala, meson, ninja, pkg-config, pantheon, gettext, wrapGAppsHook3, python3, desktop-file-utils , gtk3, glib, libgee, libgda, gtksourceview, libxml2, libsecret, libssh2 }: @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { sha256 = "sha256-MsHHTYERe0v+u3KnVtx+jmJTKORJTJ7bNfJMZHV9Ly4="; }; - nativeBuildInputs = [ meson ninja pkg-config vala gettext wrapGAppsHook python3 desktop-file-utils ]; + nativeBuildInputs = [ meson ninja pkg-config vala gettext wrapGAppsHook3 python3 desktop-file-utils ]; buildInputs = [ gtk3 glib pantheon.granite libgee sqlGda gtksourceview libxml2 libsecret libssh2 ]; diff --git a/pkgs/applications/misc/shipments/default.nix b/pkgs/applications/misc/shipments/default.nix index 792f997c5f850..1bcb2e4e104f4 100644 --- a/pkgs/applications/misc/shipments/default.nix +++ b/pkgs/applications/misc/shipments/default.nix @@ -9,7 +9,7 @@ , pkg-config , python3 , stdenv -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meson ninja pkg-config - wrapGAppsHook + wrapGAppsHook3 gobject-introspection ]; diff --git a/pkgs/applications/misc/siglo/default.nix b/pkgs/applications/misc/siglo/default.nix index 1231d2fd47fd9..2aeedcc25b2b6 100644 --- a/pkgs/applications/misc/siglo/default.nix +++ b/pkgs/applications/misc/siglo/default.nix @@ -4,7 +4,7 @@ , glib , meson , ninja -, wrapGAppsHook +, wrapGAppsHook3 , desktop-file-utils , gobject-introspection , gtk3 @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { glib meson ninja - wrapGAppsHook + wrapGAppsHook3 python3.pkgs.wrapPython python3 desktop-file-utils diff --git a/pkgs/applications/misc/skytemple/default.nix b/pkgs/applications/misc/skytemple/default.nix index 116c5096cb599..4442e79944ac1 100644 --- a/pkgs/applications/misc/skytemple/default.nix +++ b/pkgs/applications/misc/skytemple/default.nix @@ -4,7 +4,7 @@ , gtk3 , gtksourceview4 , webkitgtk -, wrapGAppsHook +, wrapGAppsHook3 , python3Packages }: @@ -31,7 +31,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ gobject-introspection - wrapGAppsHook + wrapGAppsHook3 ]; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/applications/misc/slic3r/default.nix b/pkgs/applications/misc/slic3r/default.nix index 6695f53e99327..102dc8f4b3c8d 100644 --- a/pkgs/applications/misc/slic3r/default.nix +++ b/pkgs/applications/misc/slic3r/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, perl, makeWrapper -, makeDesktopItem, which, perlPackages, boost, wrapGAppsHook +, makeDesktopItem, which, perlPackages, boost, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-cf0QTOzhLyTcbJryCQoTVzU8kfrPV6SLpqi4s36X5N0="; }; - nativeBuildInputs = [ makeWrapper which wrapGAppsHook ]; + nativeBuildInputs = [ makeWrapper which wrapGAppsHook3 ]; buildInputs = [boost] ++ (with perlPackages; [ perl diff --git a/pkgs/applications/misc/snapmaker-luban/default.nix b/pkgs/applications/misc/snapmaker-luban/default.nix index 351a17c5fc4d2..dc5fe5993f4f7 100644 --- a/pkgs/applications/misc/snapmaker-luban/default.nix +++ b/pkgs/applications/misc/snapmaker-luban/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, autoPatchelfHook, makeDesktopItem, copyDesktopItems, wrapGAppsHook, fetchurl +{ lib, stdenv, autoPatchelfHook, makeDesktopItem, copyDesktopItems, wrapGAppsHook3, fetchurl , alsa-lib, at-spi2-atk, at-spi2-core, atk, cairo, cups , gtk3, nss, glib, dbus, nspr, gdk-pixbuf, libdrm, mesa , libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoPatchelfHook - wrapGAppsHook + wrapGAppsHook3 copyDesktopItems ]; diff --git a/pkgs/applications/misc/snapper-gui/default.nix b/pkgs/applications/misc/snapper-gui/default.nix index c82b0813f78ba..8029eee15f896 100644 --- a/pkgs/applications/misc/snapper-gui/default.nix +++ b/pkgs/applications/misc/snapper-gui/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, python3, python3Packages -, gnome, gtk3, wrapGAppsHook, gtksourceview3, snapper +, gnome, gtk3, wrapGAppsHook3, gtksourceview3, snapper , gobject-introspection }: @@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec { sha256 = "13j4spbi9pxg69zifzai8ifk4207sn0vwh6vjqryi0snd5sylh7h"; }; - nativeBuildInputs = [ wrapGAppsHook gobject-introspection ]; + nativeBuildInputs = [ wrapGAppsHook3 gobject-introspection ]; buildInputs = [ python3 diff --git a/pkgs/applications/misc/solaar/default.nix b/pkgs/applications/misc/solaar/default.nix index f3cd458510b35..8d59db378728c 100644 --- a/pkgs/applications/misc/solaar/default.nix +++ b/pkgs/applications/misc/solaar/default.nix @@ -3,7 +3,7 @@ , gobject-introspection , gtk3 , python3Packages -, wrapGAppsHook +, wrapGAppsHook3 , gdk-pixbuf , libappindicator , librsvg @@ -28,7 +28,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ gdk-pixbuf gobject-introspection - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/misc/sticky/default.nix b/pkgs/applications/misc/sticky/default.nix index 9e9df71ddf9ac..423944cafb1fa 100644 --- a/pkgs/applications/misc/sticky/default.nix +++ b/pkgs/applications/misc/sticky/default.nix @@ -5,7 +5,7 @@ , meson , ninja , python3 -, wrapGAppsHook +, wrapGAppsHook3 , cinnamon , glib , gspell @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meson ninja python3.pkgs.wrapPython - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/misc/streamdeck-ui/default.nix b/pkgs/applications/misc/streamdeck-ui/default.nix index f46be1a24324b..f8ecf3694e511 100644 --- a/pkgs/applications/misc/streamdeck-ui/default.nix +++ b/pkgs/applications/misc/streamdeck-ui/default.nix @@ -4,7 +4,7 @@ , copyDesktopItems , writeText , makeDesktopItem -, wrapGAppsHook +, wrapGAppsHook3 , xvfb-run , qt6 }: @@ -71,7 +71,7 @@ python3Packages.buildPythonApplication rec { python3Packages.poetry-core copyDesktopItems qt6.wrapQtAppsHook - wrapGAppsHook + wrapGAppsHook3 ]; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/applications/misc/survex/default.nix b/pkgs/applications/misc/survex/default.nix index 6f2098ea4778b..2bb4184b4353b 100644 --- a/pkgs/applications/misc/survex/default.nix +++ b/pkgs/applications/misc/survex/default.nix @@ -14,7 +14,7 @@ , pkg-config , proj , python3 -, wrapGAppsHook +, wrapGAppsHook3 , wxGTK32 }: @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { perl pkg-config python3 - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/misc/swappy/default.nix b/pkgs/applications/misc/swappy/default.nix index b0cfc24aab655..cb56e4281da06 100644 --- a/pkgs/applications/misc/swappy/default.nix +++ b/pkgs/applications/misc/swappy/default.nix @@ -11,7 +11,7 @@ , scdoc , libnotify , glib -, wrapGAppsHook +, wrapGAppsHook3 , hicolor-icon-theme }: @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { hash = "sha256-/XPvy98Il4i8cDl9vH6f0/AZmiSqseSXnen7HfMqCDo="; }; - nativeBuildInputs = [ glib meson ninja pkg-config scdoc wrapGAppsHook ]; + nativeBuildInputs = [ glib meson ninja pkg-config scdoc wrapGAppsHook3 ]; buildInputs = [ cairo pango gtk libnotify wayland glib hicolor-icon-theme diff --git a/pkgs/applications/misc/swaynotificationcenter/default.nix b/pkgs/applications/misc/swaynotificationcenter/default.nix index 3f2310a8507f7..b2ea718d87e55 100644 --- a/pkgs/applications/misc/swaynotificationcenter/default.nix +++ b/pkgs/applications/misc/swaynotificationcenter/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchFromGitHub , testers -, wrapGAppsHook +, wrapGAppsHook3 , bash-completion , dbus , dbus-glib @@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: rec { sassc scdoc vala - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/misc/swaysettings/default.nix b/pkgs/applications/misc/swaysettings/default.nix index babd312d3edde..490f0048081e5 100644 --- a/pkgs/applications/misc/swaysettings/default.nix +++ b/pkgs/applications/misc/swaysettings/default.nix @@ -22,7 +22,7 @@ , python3 , stdenv , vala -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { pkg-config python3 vala - wrapGAppsHook + wrapGAppsHook3 gobject-introspection ]; diff --git a/pkgs/applications/misc/system76-keyboard-configurator/default.nix b/pkgs/applications/misc/system76-keyboard-configurator/default.nix index 94dc95a466cd4..096f0589baedf 100644 --- a/pkgs/applications/misc/system76-keyboard-configurator/default.nix +++ b/pkgs/applications/misc/system76-keyboard-configurator/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, gtk3, glib, wrapGAppsHook, libusb1, hidapi, udev, pkg-config }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, gtk3, glib, wrapGAppsHook3, libusb1, hidapi, udev, pkg-config }: # system76-keyboard-configurator tries to spawn a daemon as root via pkexec, so # your system needs a PolicyKit authentication agent running for the @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config glib # for glib-compile-resources - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/misc/themechanger/default.nix b/pkgs/applications/misc/themechanger/default.nix index 652fe267852a9..e1c26828c97ee 100644 --- a/pkgs/applications/misc/themechanger/default.nix +++ b/pkgs/applications/misc/themechanger/default.nix @@ -3,7 +3,7 @@ , meson , ninja , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , desktop-file-utils , glib , gtk3 @@ -30,7 +30,7 @@ python3Packages.buildPythonApplication rec { meson ninja pkg-config - wrapGAppsHook + wrapGAppsHook3 desktop-file-utils gtk3 ]; diff --git a/pkgs/applications/misc/tint2/default.nix b/pkgs/applications/misc/tint2/default.nix index ac50a46fde6db..18aa389ac1e7c 100644 --- a/pkgs/applications/misc/tint2/default.nix +++ b/pkgs/applications/misc/tint2/default.nix @@ -20,7 +20,7 @@ , libpthreadstubs , libXdmcp , libstartup_notification -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { pkg-config cmake gettext - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/misc/tuhi/default.nix b/pkgs/applications/misc/tuhi/default.nix index b3334c59c4a0a..759ad401ede6c 100644 --- a/pkgs/applications/misc/tuhi/default.nix +++ b/pkgs/applications/misc/tuhi/default.nix @@ -8,7 +8,7 @@ , glib , gtk3 , gobject-introspection -, wrapGAppsHook +, wrapGAppsHook3 , fetchFromGitHub }: @@ -33,7 +33,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ pkg-config meson ninja appstream-glib desktop-file-utils - wrapGAppsHook + wrapGAppsHook3 gobject-introspection ]; buildInputs = [ diff --git a/pkgs/applications/misc/udiskie/default.nix b/pkgs/applications/misc/udiskie/default.nix index 94ea64d3792bb..7df3f1d23b9cc 100644 --- a/pkgs/applications/misc/udiskie/default.nix +++ b/pkgs/applications/misc/udiskie/default.nix @@ -9,7 +9,7 @@ , librsvg , python3 , udisks2 -, wrapGAppsHook +, wrapGAppsHook3 , testers , udiskie }: @@ -40,7 +40,7 @@ python3.pkgs.buildPythonApplication rec { gobject-introspection installShellFiles python3.pkgs.setuptools - wrapGAppsHook + wrapGAppsHook3 ]; dontWrapGApps = true; diff --git a/pkgs/applications/misc/ulauncher/default.nix b/pkgs/applications/misc/ulauncher/default.nix index 080e96359e5ad..9c455fa6ba729 100644 --- a/pkgs/applications/misc/ulauncher/default.nix +++ b/pkgs/applications/misc/ulauncher/default.nix @@ -7,7 +7,7 @@ , gnome , gobject-introspection , gtk3 -, wrapGAppsHook +, wrapGAppsHook3 , webkitgtk , libnotify , keybinder3 @@ -32,7 +32,7 @@ python3Packages.buildPythonApplication rec { distutils-extra gobject-introspection intltool - wrapGAppsHook + wrapGAppsHook3 gdk-pixbuf ]; diff --git a/pkgs/applications/misc/upwork/default.nix b/pkgs/applications/misc/upwork/default.nix index e1cf49f61aec5..6375b2537258d 100644 --- a/pkgs/applications/misc/upwork/default.nix +++ b/pkgs/applications/misc/upwork/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, requireFile, dpkg, wrapGAppsHook, autoPatchelfHook +{ lib, stdenv, requireFile, dpkg, wrapGAppsHook3, autoPatchelfHook , alsa-lib, atk, at-spi2-atk, at-spi2-core, cairo, cups, dbus, expat, fontconfig, freetype , gdk-pixbuf, glib, gtk3, libcxx, libdrm, libnotify, libpulseaudio, libuuid, libX11, libxcb , libXcomposite, libXcursor, libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ dpkg - wrapGAppsHook + wrapGAppsHook3 autoPatchelfHook ]; diff --git a/pkgs/applications/misc/variety/default.nix b/pkgs/applications/misc/variety/default.nix index e26496718f39c..e90a8e9a1e01c 100644 --- a/pkgs/applications/misc/variety/default.nix +++ b/pkgs/applications/misc/variety/default.nix @@ -10,7 +10,7 @@ , librsvg , python3 , runtimeShell -, wrapGAppsHook +, wrapGAppsHook3 , fehSupport ? false , feh , imagemagickSupport ? true @@ -32,7 +32,7 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = [ intltool - wrapGAppsHook + wrapGAppsHook3 gobject-introspection ]; diff --git a/pkgs/applications/misc/veracrypt/default.nix b/pkgs/applications/misc/veracrypt/default.nix index 66aca8645adca..a7b0eed9037b0 100644 --- a/pkgs/applications/misc/veracrypt/default.nix +++ b/pkgs/applications/misc/veracrypt/default.nix @@ -13,7 +13,7 @@ , ntfs3g , btrfs-progs , pcsclite -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { sourceRoot = "src"; - nativeBuildInputs = [ makeself pkg-config yasm wrapGAppsHook ]; + nativeBuildInputs = [ makeself pkg-config yasm wrapGAppsHook3 ]; buildInputs = [ fuse lvm2 wxGTK pcsclite ]; enableParallelBuilding = true; diff --git a/pkgs/applications/misc/viking/default.nix b/pkgs/applications/misc/viking/default.nix index 8a987ed24672e..1335d950405fb 100644 --- a/pkgs/applications/misc/viking/default.nix +++ b/pkgs/applications/misc/viking/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, fetchpatch , desktopToDarwinBundle -, docbook_xml_dtd_45, docbook_xsl, intltool, itstool, libxslt, pkg-config, wrapGAppsHook, yelp-tools +, docbook_xml_dtd_45, docbook_xsl, intltool, itstool, libxslt, pkg-config, wrapGAppsHook3, yelp-tools , curl, gdk-pixbuf, gtk3, json-glib, libxml2 , gpsbabel , withGeoClue ? true, geoclue2 @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ docbook_xml_dtd_45 docbook_xsl intltool itstool libxslt pkg-config wrapGAppsHook yelp-tools ] + nativeBuildInputs = [ docbook_xml_dtd_45 docbook_xsl intltool itstool libxslt pkg-config wrapGAppsHook3 yelp-tools ] ++ lib.optional stdenv.isDarwin desktopToDarwinBundle; buildInputs = [ curl gdk-pixbuf gtk3 json-glib libxml2 ] diff --git a/pkgs/applications/misc/volnoti/default.nix b/pkgs/applications/misc/volnoti/default.nix index bd61cd753f986..f03de6d9e658e 100644 --- a/pkgs/applications/misc/volnoti/default.nix +++ b/pkgs/applications/misc/volnoti/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, fetchpatch , pkg-config, dbus, gdk-pixbuf, glib, libX11, gtk2, librsvg -, dbus-glib, autoreconfHook, wrapGAppsHook }: +, dbus-glib, autoreconfHook, wrapGAppsHook3 }: stdenv.mkDerivation { pname = "volnoti-unstable"; @@ -22,7 +22,7 @@ stdenv.mkDerivation { }) ]; - nativeBuildInputs = [ pkg-config autoreconfHook wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook wrapGAppsHook3 ]; buildInputs = [ dbus gdk-pixbuf glib libX11 gtk2 dbus-glib librsvg diff --git a/pkgs/applications/misc/waypaper/default.nix b/pkgs/applications/misc/waypaper/default.nix index 36f79865d31ad..2722d8782fb4d 100644 --- a/pkgs/applications/misc/waypaper/default.nix +++ b/pkgs/applications/misc/waypaper/default.nix @@ -2,7 +2,7 @@ , python3 , fetchFromGitHub , gobject-introspection -, wrapGAppsHook +, wrapGAppsHook3 , killall }: @@ -19,7 +19,7 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = [ gobject-introspection - wrapGAppsHook + wrapGAppsHook3 ]; propagatedBuildInputs = [ diff --git a/pkgs/applications/misc/wofi/default.nix b/pkgs/applications/misc/wofi/default.nix index 30e7072644f39..fc124c56eb569 100644 --- a/pkgs/applications/misc/wofi/default.nix +++ b/pkgs/applications/misc/wofi/default.nix @@ -6,7 +6,7 @@ , ninja , wayland , gtk3 -, wrapGAppsHook +, wrapGAppsHook3 , installShellFiles }: stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { vc = "hg"; }; - nativeBuildInputs = [ pkg-config meson ninja wrapGAppsHook installShellFiles ]; + nativeBuildInputs = [ pkg-config meson ninja wrapGAppsHook3 installShellFiles ]; buildInputs = [ wayland gtk3 ]; patches = [ diff --git a/pkgs/applications/misc/workrave/default.nix b/pkgs/applications/misc/workrave/default.nix index c4a5e692cfcac..ebe09f8b861c2 100644 --- a/pkgs/applications/misc/workrave/default.nix +++ b/pkgs/applications/misc/workrave/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchFromGitHub -, wrapGAppsHook +, wrapGAppsHook3 , autoconf , autoconf-archive , automake @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { intltool libtool pkg-config - wrapGAppsHook + wrapGAppsHook3 jinja2 gobject-introspection ]; diff --git a/pkgs/applications/misc/xautoclick/default.nix b/pkgs/applications/misc/xautoclick/default.nix index 3429e80f0540e..68daf189fc9b2 100644 --- a/pkgs/applications/misc/xautoclick/default.nix +++ b/pkgs/applications/misc/xautoclick/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, xorg, pkg-config , cmake, libevdev -, gtkSupport ? true, gtk3, pcre, glib, wrapGAppsHook +, gtkSupport ? true, gtk3, pcre, glib, wrapGAppsHook3 , fltkSupport ? true, fltk , qtSupport ? true, qt5 }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libevdev xorg.libXtst ] - ++ lib.optionals gtkSupport [ gtk3 pcre glib wrapGAppsHook ] + ++ lib.optionals gtkSupport [ gtk3 pcre glib wrapGAppsHook3 ] ++ lib.optionals fltkSupport [ fltk ] ++ lib.optionals qtSupport [ qt5.qtbase qt5.wrapQtAppsHook ]; diff --git a/pkgs/applications/misc/xdgmenumaker/default.nix b/pkgs/applications/misc/xdgmenumaker/default.nix index 130b97189a626..f2953805ff29c 100644 --- a/pkgs/applications/misc/xdgmenumaker/default.nix +++ b/pkgs/applications/misc/xdgmenumaker/default.nix @@ -6,7 +6,7 @@ , pango , python3Packages , txt2tags -, wrapGAppsHook +, wrapGAppsHook3 , gitUpdater }: @@ -30,7 +30,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ gobject-introspection txt2tags - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/misc/xiphos/default.nix b/pkgs/applications/misc/xiphos/default.nix index 994127baca6d0..83690f129bffa 100644 --- a/pkgs/applications/misc/xiphos/default.nix +++ b/pkgs/applications/misc/xiphos/default.nix @@ -23,7 +23,7 @@ , pkg-config , sword , webkitgtk -, wrapGAppsHook +, wrapGAppsHook3 , yelp-tools , zip }: @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { itstool libxslt pkg-config - wrapGAppsHook + wrapGAppsHook3 yelp-tools # for yelp-build zip # for building help epubs ]; diff --git a/pkgs/applications/misc/xneur/default.nix b/pkgs/applications/misc/xneur/default.nix index e282d84f9c931..6f99290c517a8 100644 --- a/pkgs/applications/misc/xneur/default.nix +++ b/pkgs/applications/misc/xneur/default.nix @@ -5,7 +5,7 @@ , autoreconfHook , intltool , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , enchant , gdk-pixbuf , glib @@ -29,7 +29,7 @@ stdenv.mkDerivation { autoreconfHook intltool pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/misc/xpad/default.nix b/pkgs/applications/misc/xpad/default.nix index 13b29491bf3f7..d945ae7ff0baa 100644 --- a/pkgs/applications/misc/xpad/default.nix +++ b/pkgs/applications/misc/xpad/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl -, autoreconfHook, pkg-config, wrapGAppsHook +, autoreconfHook, pkg-config, wrapGAppsHook3 , glib, intltool, gtk3, gtksourceview }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1qpmlwn0bcw1q73ag0l0fdnlzmwawfvsy4g9y5b0vyrc58lcp5d3"; }; - nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook intltool ]; + nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook3 intltool ]; buildInputs = [ glib gtk3 gtksourceview ]; diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix index 3b529c18f52dc..8b452c7f1a40c 100644 --- a/pkgs/applications/misc/zathura/core/default.nix +++ b/pkgs/applications/misc/zathura/core/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, meson, ninja, wrapGAppsHook, pkg-config, gitUpdater +{ lib, stdenv, fetchFromGitLab, meson, ninja, wrapGAppsHook3, pkg-config, gitUpdater , appstream-glib, json-glib, desktop-file-utils, python3 , gtk, girara, gettext, libxml2, check , sqlite, glib, texlive, libintl, libseccomp @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ meson ninja pkg-config desktop-file-utils python3.pythonOnBuildForHost.pkgs.sphinx - gettext wrapGAppsHook libxml2 appstream-glib + gettext wrapGAppsHook3 libxml2 appstream-glib ]; buildInputs = [ diff --git a/pkgs/applications/networking/browsers/badwolf/default.nix b/pkgs/applications/networking/browsers/badwolf/default.nix index 5772586d8d4ef..dabbdf8981923 100644 --- a/pkgs/applications/networking/browsers/badwolf/default.nix +++ b/pkgs/applications/networking/browsers/badwolf/default.nix @@ -4,7 +4,7 @@ , ninja , pkg-config , ed -, wrapGAppsHook +, wrapGAppsHook3 , webkitgtk , libxml2 , glib-networking @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ninja pkg-config ed - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/networking/browsers/brave/make-brave.nix b/pkgs/applications/networking/browsers/brave/make-brave.nix index 8fde41e60a16b..f0b9fb6cf0c6e 100644 --- a/pkgs/applications/networking/browsers/brave/make-brave.nix +++ b/pkgs/applications/networking/browsers/brave/make-brave.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, wrapGAppsHook, makeWrapper +{ lib, stdenv, fetchurl, wrapGAppsHook3, makeWrapper , alsa-lib , at-spi2-atk , at-spi2-core @@ -112,7 +112,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ dpkg - (wrapGAppsHook.override { inherit makeWrapper; }) + (wrapGAppsHook3.override { inherit makeWrapper; }) ]; buildInputs = [ diff --git a/pkgs/applications/networking/browsers/castor/default.nix b/pkgs/applications/networking/browsers/castor/default.nix index 6d35a7091e8f5..f02ae0f6e05e3 100644 --- a/pkgs/applications/networking/browsers/castor/default.nix +++ b/pkgs/applications/networking/browsers/castor/default.nix @@ -2,7 +2,7 @@ , fetchFromSourcehut , rustPlatform , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , openssl , gtk3 , gdk-pixbuf @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index a59efb64d9356..d78943a5c5c26 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -1,6 +1,7 @@ { stdenv, lib, fetchurl, fetchpatch , recompressTarball , buildPackages +, buildPlatform , pkgsBuildBuild , pkgsBuildTarget # Channel data: @@ -114,9 +115,6 @@ let # "opus" ]; - opusWithCustomModes = libopus.override { - withCustomModes = true; - }; # build paths and release info packageName = extraAttrs.packageName or extraAttrs.name; @@ -175,7 +173,6 @@ let buildPlatformLlvmStdenv.cc pkg-config libuuid - (libpng.override { apngSupport = false; }) # needed for "host/generate_colors_info" ] # When cross-compiling, chromium builds a huge proportion of its # components for both the `buildPlatform` (which it calls @@ -183,12 +180,39 @@ let # half of the dependencies are needed here. To avoid having to # maintain a separate list of buildPlatform-dependencies, we # simply throw in the kitchen sink. - ++ buildInputs - ; + # ** Because of overrides, we have to copy the list as it otherwise mess with splicing ** + ++ [ + (buildPackages.libpng.override { apngSupport = false; }) # https://bugs.chromium.org/p/chromium/issues/detail?id=752403 + (buildPackages.libopus.override { withCustomModes = true; }) + bzip2 flac speex + libevent expat libjpeg snappy + libcap + minizip libwebp + libusb1 re2 + ffmpeg libxslt libxml2 + nasm + nspr nss + util-linux alsa-lib + libkrb5 + glib gtk3 dbus-glib + libXScrnSaver libXcursor libXtst libxshmfence libGLU libGL + mesa # required for libgbm + pciutils protobuf speechd libXdamage at-spi2-core + pipewire + libva + libdrm wayland mesa.drivers libxkbcommon + curl + libepoxy + libffi + libevdev + ] ++ lib.optional systemdSupport systemd + ++ lib.optionals cupsSupport [ libgcrypt cups ] + ++ lib.optional pulseSupport libpulseaudio; buildInputs = [ - (libpng.override { apngSupport = false; }) # https://bugs.chromium.org/p/chromium/issues/detail?id=752403 - bzip2 flac speex opusWithCustomModes + (libpng.override { apngSupport = false; }) # https://bugs.chromium.org/p/chromium/issues/detail?id=752403 + (libopus.override { withCustomModes = true; }) + bzip2 flac speex libevent expat libjpeg snappy libcap minizip libwebp diff --git a/pkgs/applications/networking/browsers/eolie/default.nix b/pkgs/applications/networking/browsers/eolie/default.nix index 409319493a64f..8649969d8c30a 100644 --- a/pkgs/applications/networking/browsers/eolie/default.nix +++ b/pkgs/applications/networking/browsers/eolie/default.nix @@ -1,7 +1,7 @@ { lib, fetchgit, meson, ninja, pkg-config, nix-update-script , python3, gtk3, libsecret, gst_all_1, webkitgtk, glib , glib-networking, gtkspell3, hunspell, desktop-file-utils -, gobject-introspection, wrapGAppsHook, gnome }: +, gobject-introspection, wrapGAppsHook3, gnome }: python3.pkgs.buildPythonApplication rec { pname = "eolie"; @@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication rec { meson ninja pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = with gst_all_1; [ diff --git a/pkgs/applications/networking/browsers/ephemeral/default.nix b/pkgs/applications/networking/browsers/ephemeral/default.nix index 4002d52715b30..41ae308ff0312 100644 --- a/pkgs/applications/networking/browsers/ephemeral/default.nix +++ b/pkgs/applications/networking/browsers/ephemeral/default.nix @@ -14,7 +14,7 @@ , pkg-config , python3 , webkitgtk -, wrapGAppsHook +, wrapGAppsHook3 , glib-networking }: @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { vala pkg-config python3 - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 44b63cab7dbbe..81abbb268397f 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, config, wrapGAppsHook, autoPatchelfHook +{ lib, stdenv, fetchurl, config, wrapGAppsHook3, autoPatchelfHook , alsa-lib , curl , dbus-glib @@ -64,7 +64,7 @@ stdenv.mkDerivation { src = fetchurl { inherit (source) url sha256; }; - nativeBuildInputs = [ wrapGAppsHook autoPatchelfHook patchelfUnstable ]; + nativeBuildInputs = [ wrapGAppsHook3 autoPatchelfHook patchelfUnstable ]; buildInputs = [ gtk3 adwaita-icon-theme diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 4483cd31bd653..56dda27e54c92 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -50,7 +50,7 @@ in , rustPlatform , unzip , which -, wrapGAppsHook +, wrapGAppsHook3 # runtime , bzip2 @@ -289,7 +289,7 @@ buildStdenv.mkDerivation { rustc unzip which - wrapGAppsHook + wrapGAppsHook3 ] ++ lib.optionals crashreporterSupport [ dump_syms patchelf ] ++ lib.optionals pgoSupport [ xvfb-run ] diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index 17b7e288f0a63..8abb0f8f3ae82 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, patchelf, makeWrapper +{ lib, stdenv, patchelf, makeWrapper, fetchurl # Linked dynamic libraries. , glib, fontconfig, freetype, pango, cairo, libX11, libXi, atk, nss, nspr @@ -28,15 +28,9 @@ ## Gentoo , bzip2, libcap -# Which distribution channel to use. -, channel ? "stable" - # Necessary for USB audio devices. , pulseSupport ? true, libpulseaudio -# Only needed for getting information about upstream binaries -, chromium - , gsettings-desktop-schemas , gnome @@ -52,8 +46,6 @@ let withCustomModes = true; }; - version = chromium.upstream-info.version; - deps = [ glib fontconfig freetype pango cairo libX11 libXi atk nss nspr libXcursor libXext libXfixes libXrender libXScrnSaver libXcomposite libxcb @@ -70,18 +62,14 @@ let ++ lib.optional libvaSupport libva ++ [ gtk3 gtk4 ]; - suffix = lib.optionalString (channel != "stable") "-${channel}"; - - crashpadHandlerBinary = if lib.versionAtLeast version "94" - then "chrome_crashpad_handler" - else "crashpad_handler"; +in stdenv.mkDerivation (finalAttrs: { + pname = "google-chrome"; + version = "124.0.6367.118"; -in stdenv.mkDerivation { - inherit version; - - name = "google-chrome${suffix}-${version}"; - - src = chromium.chromeSrc; + src = fetchurl { + url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb"; + hash = "sha256-H3bv6WiVBl4j38ROZ80+SD9UO9ok+xxcKFxDd9yjWNY="; + }; nativeBuildInputs = [ patchelf makeWrapper ]; buildInputs = [ @@ -103,11 +91,8 @@ in stdenv.mkDerivation { installPhase = '' runHook preInstall - case ${channel} in - beta) appname=chrome-beta dist=beta ;; - dev) appname=chrome-unstable dist=unstable ;; - *) appname=chrome dist=stable ;; - esac + appname=chrome + dist=stable exe=$out/bin/google-chrome-$dist @@ -149,7 +134,7 @@ in stdenv.mkDerivation { --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ --add-flags ${lib.escapeShellArg commandLineArgs} - for elf in $out/share/google/$appname/{chrome,chrome-sandbox,${crashpadHandlerBinary}}; do + for elf in $out/share/google/$appname/{chrome,chrome-sandbox,chrome_crashpad_handler}; do patchelf --set-rpath $rpath $elf patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $elf done @@ -162,13 +147,8 @@ in stdenv.mkDerivation { homepage = "https://www.google.com/chrome/browser/"; license = licenses.unfree; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - maintainers = with maintainers; [ primeos ]; - # Note from primeos: By updating Chromium I also update Google Chrome and - # will try to merge PRs and respond to issues but I'm not actually using - # Google Chrome. + maintainers = with maintainers; [ jnsgruk ]; platforms = [ "x86_64-linux" ]; - mainProgram = - if (channel == "dev") then "google-chrome-unstable" - else "google-chrome-${channel}"; + mainProgram = "google-chrome-stable"; }; -} +}) diff --git a/pkgs/applications/networking/browsers/luakit/default.nix b/pkgs/applications/networking/browsers/luakit/default.nix index a861f2f44bfc4..6011755e3892e 100644 --- a/pkgs/applications/networking/browsers/luakit/default.nix +++ b/pkgs/applications/networking/browsers/luakit/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchFromGitHub , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , help2man , glib-networking , gst_all_1 @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config help2man - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ gtk3 diff --git a/pkgs/applications/networking/browsers/midori/default.nix b/pkgs/applications/networking/browsers/midori/default.nix index 3bf46be683193..f937f690b5820 100644 --- a/pkgs/applications/networking/browsers/midori/default.nix +++ b/pkgs/applications/networking/browsers/midori/default.nix @@ -5,7 +5,7 @@ , pkg-config , intltool , vala -, wrapGAppsHook +, wrapGAppsHook3 , gcr , libpeas , gtk3 @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ninja pkg-config vala - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/networking/browsers/mullvad-browser/default.nix b/pkgs/applications/networking/browsers/mullvad-browser/default.nix index a34b5022a7a39..580bee84b70ea 100644 --- a/pkgs/applications/networking/browsers/mullvad-browser/default.nix +++ b/pkgs/applications/networking/browsers/mullvad-browser/default.nix @@ -5,7 +5,7 @@ , copyDesktopItems , makeWrapper , writeText -, wrapGAppsHook +, wrapGAppsHook3 , autoPatchelfHook , callPackage @@ -125,7 +125,7 @@ stdenv.mkDerivation rec { src = sources.${stdenv.hostPlatform.system} or (throw "unsupported system: ${stdenv.hostPlatform.system}"); - nativeBuildInputs = [ copyDesktopItems makeWrapper wrapGAppsHook autoPatchelfHook ]; + nativeBuildInputs = [ copyDesktopItems makeWrapper wrapGAppsHook3 autoPatchelfHook ]; buildInputs = [ gtk3 alsa-lib diff --git a/pkgs/applications/networking/browsers/netsurf/browser.nix b/pkgs/applications/networking/browsers/netsurf/browser.nix index 6feb02faa9d2b..36f669439d000 100644 --- a/pkgs/applications/networking/browsers/netsurf/browser.nix +++ b/pkgs/applications/networking/browsers/netsurf/browser.nix @@ -20,7 +20,7 @@ , openssl , perlPackages , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , xxd # Netsurf-specific dependencies @@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: { pkg-config xxd ] - ++ lib.optional (uilib == "gtk2" || uilib == "gtk3") wrapGAppsHook; + ++ lib.optional (uilib == "gtk2" || uilib == "gtk3") wrapGAppsHook3; buildInputs = [ check diff --git a/pkgs/applications/networking/browsers/nyxt/default.nix b/pkgs/applications/networking/browsers/nyxt/default.nix index 6a990201c75d9..d0a040748dc87 100644 --- a/pkgs/applications/networking/browsers/nyxt/default.nix +++ b/pkgs/applications/networking/browsers/nyxt/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, sbclPackages -, makeWrapper, wrapGAppsHook, gst_all_1 +, makeWrapper, wrapGAppsHook3, gst_all_1 , glib, gdk-pixbuf, cairo , mailcap, pango, gtk3 , glib-networking, gsettings-desktop-schemas @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = sbclPackages.nyxt; - nativeBuildInputs = [ makeWrapper wrapGAppsHook ]; + nativeBuildInputs = [ makeWrapper wrapGAppsHook3 ]; gstBuildInputs = with gst_all_1; [ gstreamer gst-libav gst-plugins-base diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index 94f2a466295f4..e8638a1313f9e 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -40,7 +40,7 @@ , at-spi2-atk , at-spi2-core , autoPatchelfHook -, wrapGAppsHook +, wrapGAppsHook3 , qt6 , proprietaryCodecs ? false , vivaldi-ffmpeg-codecs @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ dpkg autoPatchelfHook - wrapGAppsHook + wrapGAppsHook3 qt6.wrapQtAppsHook ]; diff --git a/pkgs/applications/networking/browsers/palemoon/bin.nix b/pkgs/applications/networking/browsers/palemoon/bin.nix index 9b3ea171b4f5e..3a449623a0f61 100644 --- a/pkgs/applications/networking/browsers/palemoon/bin.nix +++ b/pkgs/applications/networking/browsers/palemoon/bin.nix @@ -13,7 +13,7 @@ , libXt , libpulseaudio , makeDesktopItem -, wrapGAppsHook +, wrapGAppsHook3 , writeScript , testers }: @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ autoPatchelfHook copyDesktopItems - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/networking/browsers/surf/default.nix b/pkgs/applications/networking/browsers/surf/default.nix index 012a86aadb384..ad1b9a51a4432 100644 --- a/pkgs/applications/networking/browsers/surf/default.nix +++ b/pkgs/applications/networking/browsers/surf/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchgit -, pkg-config, wrapGAppsHook +, pkg-config, wrapGAppsHook3 , glib, gcr, glib-networking, gsettings-desktop-schemas, gtk, libsoup, webkitgtk , xorg, dmenu, findutils, gnused, coreutils, gst_all_1 , patches ? null @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "1v926hiayddylq79n8l7dy51bm0dsa9n18nx9bkhg666cx973x4z"; }; - nativeBuildInputs = [ pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook3 ]; buildInputs = [ glib gcr diff --git a/pkgs/applications/networking/browsers/tor-browser/default.nix b/pkgs/applications/networking/browsers/tor-browser/default.nix index 91456e85e6f7e..7ab20a22b8d7a 100644 --- a/pkgs/applications/networking/browsers/tor-browser/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser/default.nix @@ -6,7 +6,7 @@ , makeWrapper , writeText , autoPatchelfHook -, wrapGAppsHook +, wrapGAppsHook3 , callPackage , atk @@ -144,7 +144,7 @@ stdenv.mkDerivation rec { src = sources.${stdenv.hostPlatform.system} or (throw "unsupported system: ${stdenv.hostPlatform.system}"); - nativeBuildInputs = [ autoPatchelfHook copyDesktopItems makeWrapper wrapGAppsHook ]; + nativeBuildInputs = [ autoPatchelfHook copyDesktopItems makeWrapper wrapGAppsHook3 ]; buildInputs = [ gtk3 alsa-lib diff --git a/pkgs/applications/networking/browsers/vimb/default.nix b/pkgs/applications/networking/browsers/vimb/default.nix index 8df37ed5e0862..a78fcf36f3840 100644 --- a/pkgs/applications/networking/browsers/vimb/default.nix +++ b/pkgs/applications/networking/browsers/vimb/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, pkg-config, libsoup, webkitgtk, gtk3, glib-networking -, gsettings-desktop-schemas, wrapGAppsHook +, gsettings-desktop-schemas, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-Eq4riJSznKpkW9JJDnTCLxZ9oMJTmWkIoGphOiCcSAg="; }; - nativeBuildInputs = [ wrapGAppsHook pkg-config ]; + nativeBuildInputs = [ wrapGAppsHook3 pkg-config ]; buildInputs = [ gtk3 libsoup webkitgtk glib-networking gsettings-desktop-schemas ]; passthru = { diff --git a/pkgs/applications/networking/browsers/yandex-browser/default.nix b/pkgs/applications/networking/browsers/yandex-browser/default.nix index 9c1e5a0d22455..d5f761c3b1f8a 100644 --- a/pkgs/applications/networking/browsers/yandex-browser/default.nix +++ b/pkgs/applications/networking/browsers/yandex-browser/default.nix @@ -2,7 +2,7 @@ , lib , fetchurl , autoPatchelfHook -, wrapGAppsHook +, wrapGAppsHook3 , flac , gnome2 , harfbuzzFull @@ -83,7 +83,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ autoPatchelfHook qt6.wrapQtAppsHook - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/networking/calls/default.nix b/pkgs/applications/networking/calls/default.nix index 77a80df87ed58..92c9978b4a143 100644 --- a/pkgs/applications/networking/calls/default.nix +++ b/pkgs/applications/networking/calls/default.nix @@ -21,7 +21,7 @@ , libgdata , dbus , vala -, wrapGAppsHook +, wrapGAppsHook3 , xvfb-run , gtk-doc , docbook-xsl-nons @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { desktop-file-utils appstream-glib vala - wrapGAppsHook + wrapGAppsHook3 gtk-doc docbook-xsl-nons docbook_xml_dtd_43 diff --git a/pkgs/applications/networking/cluster/atmos/default.nix b/pkgs/applications/networking/cluster/atmos/default.nix index 9e4d04befbc85..d5cd9a0851421 100644 --- a/pkgs/applications/networking/cluster/atmos/default.nix +++ b/pkgs/applications/networking/cluster/atmos/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "atmos"; - version = "1.70.0"; + version = "1.71.0"; src = fetchFromGitHub { owner = "cloudposse"; repo = pname; rev = "v${version}"; - sha256 = "sha256-NmgInrjCcMoSjSCotGU38URP7FNMaFs3N2g49Y/fXSw="; + sha256 = "sha256-RnBMVVbZQrJ85uPVLniNjpcledYnOyu5zxIYsvV63qk="; }; - vendorHash = "sha256-dJJPq2HcGZ+MqtJ848gsrvzD1rMVrwJQKwq+UpZsFB0="; + vendorHash = "sha256-dcQWD6UrsSPJZzasovBSXUKaXvL9mZF6cLp458Ia8O4="; ldflags = [ "-s" "-w" "-X github.com/cloudposse/atmos/cmd.Version=v${version}" ]; diff --git a/pkgs/applications/networking/cluster/kubeone/default.nix b/pkgs/applications/networking/cluster/kubeone/default.nix index 84ff7632cf2b9..abff9a029921e 100644 --- a/pkgs/applications/networking/cluster/kubeone/default.nix +++ b/pkgs/applications/networking/cluster/kubeone/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "kubeone"; - version = "1.7.3"; + version = "1.7.4"; src = fetchFromGitHub { owner = "kubermatic"; repo = "kubeone"; rev = "v${version}"; - hash = "sha256-m2RxSKXiKmx1p5g+C8I/l+OtV7wy2KtrFRIK+h9L5lo="; + hash = "sha256-GK5SEQjQb553MypcRpTfmewVhucP1fRldpXhfLERkMo="; }; - vendorHash = "sha256-vUy60CBrdhB9OFMZ4+q05WtrtN4/5ssozYGBV7r4BsM="; + vendorHash = "sha256-pt3EWohdXOBgE3SfEEODUi1uX/X+jJ2JrBbLFIXDbwY="; ldflags = [ "-s" diff --git a/pkgs/applications/networking/cluster/kubeshark/default.nix b/pkgs/applications/networking/cluster/kubeshark/default.nix index 32714e7d0ba40..a5fd286984c13 100644 --- a/pkgs/applications/networking/cluster/kubeshark/default.nix +++ b/pkgs/applications/networking/cluster/kubeshark/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubeshark"; - version = "52.2.39"; + version = "52.3.0"; src = fetchFromGitHub { owner = "kubeshark"; repo = "kubeshark"; rev = "v${version}"; - hash = "sha256-ji/WOCqZOIaUc+mS2zaMNjWxSgv68DGjtWxgtJCH2C4="; + hash = "sha256-7tTXhILWnYRFyKBw1Im9Q9/oqlKJAP478qiBEoTUGMc="; }; vendorHash = "sha256-SmvO9DYOXxnmN2dmHPPOguVwEbWSH/xNLBB+idpzopo="; diff --git a/pkgs/applications/networking/cluster/yor/default.nix b/pkgs/applications/networking/cluster/yor/default.nix index 107b698335979..76a9d0ce3d524 100644 --- a/pkgs/applications/networking/cluster/yor/default.nix +++ b/pkgs/applications/networking/cluster/yor/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "yor"; - version = "0.1.192"; + version = "0.1.193"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - hash = "sha256-J3hygbjpJ+etYcOHRKkuPPF2oquLWgWnps8chcU3uUU="; + hash = "sha256-6IdCnuW49DVeOJKBD6AYxr2kbv7CmpFReja3PweDSmU="; }; vendorHash = "sha256-uT/jGD4hDVes4h+mlSIT2p+C9TjxnUWsmKv9haPjjLc="; diff --git a/pkgs/applications/networking/feedreaders/gnome-feeds/default.nix b/pkgs/applications/networking/feedreaders/gnome-feeds/default.nix index 902b6a7b35cb2..edab321b11b0e 100644 --- a/pkgs/applications/networking/feedreaders/gnome-feeds/default.nix +++ b/pkgs/applications/networking/feedreaders/gnome-feeds/default.nix @@ -8,7 +8,7 @@ , meson , ninja , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , glib , glib-networking @@ -40,7 +40,7 @@ python3.pkgs.buildPythonApplication rec { meson ninja pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/networking/feedreaders/rssguard/default.nix b/pkgs/applications/networking/feedreaders/rssguard/default.nix index 499b8a2893d0e..1a3124f64ad5a 100644 --- a/pkgs/applications/networking/feedreaders/rssguard/default.nix +++ b/pkgs/applications/networking/feedreaders/rssguard/default.nix @@ -4,7 +4,7 @@ , cmake , qtwebengine , qttools -, wrapGAppsHook +, wrapGAppsHook3 , wrapQtAppsHook }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ qtwebengine qttools ]; - nativeBuildInputs = [ cmake wrapGAppsHook wrapQtAppsHook ]; + nativeBuildInputs = [ cmake wrapGAppsHook3 wrapQtAppsHook ]; qmakeFlags = [ "CONFIG+=release" ]; meta = with lib; { diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix index 351fafc136ff2..10cf454dc659e 100644 --- a/pkgs/applications/networking/ftp/filezilla/default.nix +++ b/pkgs/applications/networking/ftp/filezilla/default.nix @@ -12,7 +12,7 @@ , sqlite , tinyxml , boost -, wrapGAppsHook +, wrapGAppsHook3 , wxGTK32 , gtk3 , xdg-utils @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { "--disable-autoupdatecheck" ]; - nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook3 ]; buildInputs = [ boost diff --git a/pkgs/applications/networking/ftp/taxi/default.nix b/pkgs/applications/networking/ftp/taxi/default.nix index 75e3b43a1a274..b29ee472f146b 100644 --- a/pkgs/applications/networking/ftp/taxi/default.nix +++ b/pkgs/applications/networking/ftp/taxi/default.nix @@ -14,7 +14,7 @@ , pkg-config , python3 , vala -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { pkg-config python3 vala - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/alfaview/default.nix b/pkgs/applications/networking/instant-messengers/alfaview/default.nix index 666140c8dec2b..c8bea44ddd787 100644 --- a/pkgs/applications/networking/instant-messengers/alfaview/default.nix +++ b/pkgs/applications/networking/instant-messengers/alfaview/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, dpkg, autoPatchelfHook, makeWrapper, wrapGAppsHook +{ stdenv, lib, fetchurl, dpkg, autoPatchelfHook, makeWrapper, wrapGAppsHook3 , alsa-lib, dbus, fontconfig, freetype, glib, gst_all_1, libGL , libinput, libpulseaudio, libsecret, libtiff, libxkbcommon , mesa, openssl, systemd, xorg }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { dpkg makeWrapper autoPatchelfHook - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/armcord/default.nix b/pkgs/applications/networking/instant-messengers/armcord/default.nix index c52ed6fe5cc53..a52b77905a516 100644 --- a/pkgs/applications/networking/instant-messengers/armcord/default.nix +++ b/pkgs/applications/networking/instant-messengers/armcord/default.nix @@ -4,7 +4,7 @@ , autoPatchelfHook , dpkg , makeBinaryWrapper -, wrapGAppsHook +, wrapGAppsHook3 , alsa-lib , at-spi2-atk , at-spi2-core @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { }; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - nativeBuildInputs = [ autoPatchelfHook dpkg makeBinaryWrapper wrapGAppsHook ]; + nativeBuildInputs = [ autoPatchelfHook dpkg makeBinaryWrapper wrapGAppsHook3 ]; dontWrapGApps = true; diff --git a/pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix b/pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix index 841df5a4cd610..95956b3f25605 100644 --- a/pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix @@ -7,7 +7,7 @@ , cargo-tauri , cinny , copyDesktopItems -, wrapGAppsHook +, wrapGAppsHook3 , pkg-config , openssl , dbus @@ -65,7 +65,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ copyDesktopItems - wrapGAppsHook + wrapGAppsHook3 pkg-config cargo-tauri ]; diff --git a/pkgs/applications/networking/instant-messengers/coyim/default.nix b/pkgs/applications/networking/instant-messengers/coyim/default.nix index 8223f9598b61f..47fb0f161063f 100644 --- a/pkgs/applications/networking/instant-messengers/coyim/default.nix +++ b/pkgs/applications/networking/instant-messengers/coyim/default.nix @@ -7,7 +7,7 @@ , gdk-pixbuf , glib , gnome -, wrapGAppsHook +, wrapGAppsHook3 , gtk3 }: @@ -24,7 +24,7 @@ buildGoPackage rec { sha256 = "sha256-PmB6POaHKEXzIAaz3lAbUOhtVOzrj5oXRk90giYo6SI="; }; - nativeBuildInputs = [ pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook3 ]; buildInputs = [ glib cairo gdk-pixbuf gtk3 gnome.adwaita-icon-theme ]; diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index b4e0aca9cc58a..15ff9c7a50557 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -2,7 +2,7 @@ let versions = if stdenv.isLinux then { - stable = "0.0.51"; + stable = "0.0.52"; ptb = "0.0.81"; canary = "0.0.369"; development = "0.0.17"; @@ -17,7 +17,7 @@ let x86_64-linux = { stable = fetchurl { url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; - hash = "sha256-w8zLeaqJXdbI67X/UDxSLQxZei5eraa/BkMZa+GDpYk="; + hash = "sha256-5cJzedEuxdGizgUenB+DjFf+MwYk8uTH4tjiWzur+q8="; }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; diff --git a/pkgs/applications/networking/instant-messengers/discord/linux.nix b/pkgs/applications/networking/instant-messengers/discord/linux.nix index 1d7a64b892a09..eb3f29cf2a391 100644 --- a/pkgs/applications/networking/instant-messengers/discord/linux.nix +++ b/pkgs/applications/networking/instant-messengers/discord/linux.nix @@ -1,5 +1,5 @@ { pname, version, src, meta, binaryName, desktopName, autoPatchelfHook -, makeDesktopItem, lib, stdenv, wrapGAppsHook, makeShellWrapper, alsa-lib, at-spi2-atk +, makeDesktopItem, lib, stdenv, wrapGAppsHook3, makeShellWrapper, alsa-lib, at-spi2-atk , at-spi2-core, atk, cairo, cups, dbus, expat, fontconfig, freetype, gdk-pixbuf , glib, gtk3, libcxx, libdrm, libglvnd, libnotify, libpulseaudio, libuuid, libX11 , libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext, libXfixes @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { libxshmfence mesa nss - wrapGAppsHook + wrapGAppsHook3 makeShellWrapper ]; diff --git a/pkgs/applications/networking/instant-messengers/feishu/default.nix b/pkgs/applications/networking/instant-messengers/feishu/default.nix index 8900f26d90a45..6d89bca9e4fa0 100644 --- a/pkgs/applications/networking/instant-messengers/feishu/default.nix +++ b/pkgs/applications/networking/instant-messengers/feishu/default.nix @@ -55,7 +55,7 @@ , stdenv , systemd , wayland -, wrapGAppsHook +, wrapGAppsHook3 , xdg-utils # for custom command line arguments, e.g. "--use-gl=desktop" diff --git a/pkgs/applications/networking/instant-messengers/franz/generic.nix b/pkgs/applications/networking/instant-messengers/franz/generic.nix index 533c5c7310b38..dcbb29e61afcc 100644 --- a/pkgs/applications/networking/instant-messengers/franz/generic.nix +++ b/pkgs/applications/networking/instant-messengers/franz/generic.nix @@ -1,7 +1,7 @@ { stdenv , lib , makeWrapper -, wrapGAppsHook +, wrapGAppsHook3 , autoPatchelfHook , dpkg , xorg @@ -38,7 +38,7 @@ in stdenv.mkDerivation (rec { # Don't remove runtime deps. dontPatchELF = true; - nativeBuildInputs = [ autoPatchelfHook makeWrapper wrapGAppsHook dpkg ]; + nativeBuildInputs = [ autoPatchelfHook makeWrapper wrapGAppsHook3 dpkg ]; buildInputs = extraBuildInputs ++ (with xorg; [ libXi libXcursor diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index 458577b8d053c..765e03425aaf1 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, fetchFromGitLab, gettext, wrapGAppsHook +{ lib, fetchurl, fetchFromGitLab, gettext, wrapGAppsHook3 # Native dependencies , python3, gtk3, gobject-introspection, gnome @@ -41,7 +41,7 @@ python3.pkgs.buildPythonApplication rec { ++ lib.optional enableAppIndicator libappindicator-gtk3; nativeBuildInputs = [ - gettext wrapGAppsHook gobject-introspection + gettext wrapGAppsHook3 gobject-introspection ]; dontWrapGApps = true; @@ -77,7 +77,7 @@ python3.pkgs.buildPythonApplication rec { # test are broken in 1.7.3, 1.8.0 doCheck = false; - # necessary for wrapGAppsHook + # necessary for wrapGAppsHook3 strictDeps = false; meta = { diff --git a/pkgs/applications/networking/instant-messengers/jami/default.nix b/pkgs/applications/networking/instant-messengers/jami/default.nix index 98b4b69e69293..91676d45a04c0 100644 --- a/pkgs/applications/networking/instant-messengers/jami/default.nix +++ b/pkgs/applications/networking/instant-messengers/jami/default.nix @@ -50,7 +50,7 @@ , qtsvg , qtwebengine , qtwebchannel -, wrapGAppsHook +, wrapGAppsHook3 , withWebengine ? true # for pjsip @@ -204,7 +204,7 @@ stdenv.mkDerivation rec { dontWrapGApps = true; nativeBuildInputs = [ - wrapGAppsHook + wrapGAppsHook3 wrapQtAppsHook pkg-config cmake diff --git a/pkgs/applications/networking/instant-messengers/mikutter/default.nix b/pkgs/applications/networking/instant-messengers/mikutter/default.nix index b34ed84d044da..3938d03447f83 100644 --- a/pkgs/applications/networking/instant-messengers/mikutter/default.nix +++ b/pkgs/applications/networking/instant-messengers/mikutter/default.nix @@ -12,7 +12,7 @@ , libnotify , makeDesktopItem , which -, wrapGAppsHook +, wrapGAppsHook3 , writeText }: @@ -78,7 +78,7 @@ with mikutterPaths; stdenv.mkDerivation rec { sha256 = "05253nz4i1lmnq6czj48qdab2ny4vx2mznj6nsn2l1m2z6zqkwk3"; }; - nativeBuildInputs = [ copyDesktopItems wrapGAppsHook gobject-introspection ] + nativeBuildInputs = [ copyDesktopItems wrapGAppsHook3 gobject-introspection ] ++ lib.optionals stdenv.isDarwin [ libicns ]; buildInputs = [ atk diff --git a/pkgs/applications/networking/instant-messengers/qq/default.nix b/pkgs/applications/networking/instant-messengers/qq/default.nix index eea656250b93f..af5bdcc15f487 100644 --- a/pkgs/applications/networking/instant-messengers/qq/default.nix +++ b/pkgs/applications/networking/instant-messengers/qq/default.nix @@ -20,7 +20,7 @@ , at-spi2-core , autoPatchelfHook , makeShellWrapper -, wrapGAppsHook +, wrapGAppsHook3 , commandLineArgs ? "" }: @@ -46,7 +46,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoPatchelfHook makeShellWrapper - wrapGAppsHook + wrapGAppsHook3 dpkg ]; diff --git a/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix b/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix index 737e867bf5a63..4d7c987a213be 100644 --- a/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pkgs, fetchurl, wrapGAppsHook }: +{ lib, stdenv, pkgs, fetchurl, wrapGAppsHook3 }: let libPathNative = { packages }: lib.makeLibraryPath packages; in @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - wrapGAppsHook #to fully work with gnome also needs programs.dconf.enable = true in your configuration.nix + wrapGAppsHook3 #to fully work with gnome also needs programs.dconf.enable = true in your configuration.nix ]; buildInputs = with pkgs; [ diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix index e8518c310a7c1..c1aa03d799cc9 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix @@ -3,7 +3,7 @@ , fetchurl , autoPatchelfHook , dpkg -, wrapGAppsHook +, wrapGAppsHook3 , makeWrapper , nixosTests , gtk3 @@ -75,7 +75,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ autoPatchelfHook dpkg - (wrapGAppsHook.override { inherit makeWrapper; }) + (wrapGAppsHook3.override { inherit makeWrapper; }) ]; buildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index 50db157ccac17..99ff0b412e2cd 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, dpkg , alsa-lib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, gdk-pixbuf, glib, glibc, gnome -, gtk3, libappindicator-gtk3, libnotify, libpulseaudio, libsecret, libv4l, nspr, nss, pango, systemd, wrapGAppsHook, xorg +, gtk3, libappindicator-gtk3, libnotify, libpulseaudio, libsecret, libv4l, nspr, nss, pango, systemd, wrapGAppsHook3, xorg , at-spi2-atk, libuuid, at-spi2-core, libdrm, mesa, libxkbcommon, libxshmfence }: let @@ -82,7 +82,7 @@ in stdenv.mkDerivation { inherit src; nativeBuildInputs = [ - wrapGAppsHook + wrapGAppsHook3 glib # For setup hook populating GSETTINGS_SCHEMA_PATH ]; diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix index 604feba486c84..114b4a20e6409 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix @@ -7,7 +7,7 @@ , ninja , python3 , gobject-introspection -, wrapGAppsHook +, wrapGAppsHook3 , wrapQtAppsHook , extra-cmake-modules , qtbase @@ -110,7 +110,7 @@ stdenv.mkDerivation rec { wrapQtAppsHook ] ++ lib.optionals stdenv.isLinux [ gobject-introspection - wrapGAppsHook + wrapGAppsHook3 extra-cmake-modules ] ++ lib.optionals stdenv.isDarwin [ lld diff --git a/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix b/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix index 0d320485fe74c..50be0777ae4eb 100644 --- a/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix +++ b/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, rpmextract, undmg, autoPatchelfHook , xorg, gtk3, nss, alsa-lib, udev, libnotify -, wrapGAppsHook }: +, wrapGAppsHook3 }: let pname = "vk-messenger"; @@ -33,7 +33,7 @@ let linux = stdenv.mkDerivation { inherit pname version src meta; - nativeBuildInputs = [ rpmextract autoPatchelfHook wrapGAppsHook ]; + nativeBuildInputs = [ rpmextract autoPatchelfHook wrapGAppsHook3 ]; buildInputs = (with xorg; [ libXdamage libXtst libXScrnSaver libxkbfile ]) ++ [ gtk3 nss alsa-lib ]; diff --git a/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix b/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix index efb0fc95f33c1..7022cc282f662 100644 --- a/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix +++ b/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix @@ -21,7 +21,7 @@ , pcre2 , pkg-config , webkitgtk -, wrapGAppsHook +, wrapGAppsHook3 , xorg }: @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix index 4109c5f04cf27..0dcacc526d103 100644 --- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix @@ -6,7 +6,7 @@ , stdenv , lib , udev -, wrapGAppsHook +, wrapGAppsHook3 , cpio , xar , libdbusmenu @@ -98,7 +98,7 @@ let autoPatchelfHook dpkg makeWrapper - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/networking/irc/srain/default.nix b/pkgs/applications/networking/irc/srain/default.nix index 42fd7e1fb6530..3493fa5497b4d 100644 --- a/pkgs/applications/networking/irc/srain/default.nix +++ b/pkgs/applications/networking/irc/srain/default.nix @@ -16,7 +16,7 @@ , python3Packages , meson , ninja -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { pkg-config gettext appstream-glib - wrapGAppsHook + wrapGAppsHook3 python3Packages.sphinx ]; diff --git a/pkgs/applications/networking/mailreaders/astroid/default.nix b/pkgs/applications/networking/mailreaders/astroid/default.nix index 249d262fe1e90..e56697be4f995 100644 --- a/pkgs/applications/networking/mailreaders/astroid/default.nix +++ b/pkgs/applications/networking/mailreaders/astroid/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, gnome, gmime3, webkitgtk, ronn -, libsass, notmuch, boost, wrapGAppsHook, glib-networking, protobuf +, libsass, notmuch, boost, wrapGAppsHook3, glib-networking, protobuf , gtkmm3, libpeas, gsettings-desktop-schemas, gobject-introspection, python3 # vim to be used, should support the GUI mode. @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - cmake ronn pkg-config wrapGAppsHook gobject-introspection + cmake ronn pkg-config wrapGAppsHook3 gobject-introspection python3 python3.pkgs.wrapPython ]; diff --git a/pkgs/applications/networking/mailreaders/ayatana-webmail/default.nix b/pkgs/applications/networking/mailreaders/ayatana-webmail/default.nix index 14be9ab4f3d6c..8adb3acfe407a 100644 --- a/pkgs/applications/networking/mailreaders/ayatana-webmail/default.nix +++ b/pkgs/applications/networking/mailreaders/ayatana-webmail/default.nix @@ -7,7 +7,7 @@ , libnotify , glib , gobject-introspection -, wrapGAppsHook +, wrapGAppsHook3 # BTW libappindicator is also supported, but upstream recommends their # implementation, see: # https://github.com/AyatanaIndicators/ayatana-webmail/issues/24#issuecomment-1050352862 @@ -47,7 +47,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ gobject-introspection - wrapGAppsHook + wrapGAppsHook3 glib # For compiling gsettings-schemas ]; diff --git a/pkgs/applications/networking/mailreaders/balsa/default.nix b/pkgs/applications/networking/mailreaders/balsa/default.nix index 876a690de5a50..3602ef602fe1e 100644 --- a/pkgs/applications/networking/mailreaders/balsa/default.nix +++ b/pkgs/applications/networking/mailreaders/balsa/default.nix @@ -19,7 +19,7 @@ , pkg-config , sqlite , webkitgtk -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { pkg-config intltool gobject-introspection - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/networking/mailreaders/bluemail/default.nix b/pkgs/applications/networking/mailreaders/bluemail/default.nix index d7e1a4026de33..f565a5732f5dc 100644 --- a/pkgs/applications/networking/mailreaders/bluemail/default.nix +++ b/pkgs/applications/networking/mailreaders/bluemail/default.nix @@ -14,7 +14,7 @@ , libxshmfence , makeDesktopItem , makeWrapper -, wrapGAppsHook +, wrapGAppsHook3 , gcc-unwrapped , udev }: @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { copyDesktopItems makeWrapper dpkg - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/networking/mailreaders/bubblemail/default.nix b/pkgs/applications/networking/mailreaders/bubblemail/default.nix index bd5783a5c656c..3e5a6b1404ec6 100644 --- a/pkgs/applications/networking/mailreaders/bubblemail/default.nix +++ b/pkgs/applications/networking/mailreaders/bubblemail/default.nix @@ -7,7 +7,7 @@ , libnotify , gst_all_1 , libsecret -, wrapGAppsHook +, wrapGAppsHook3 , gsettings-desktop-schemas , gnome-online-accounts , glib @@ -45,7 +45,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ gettext - wrapGAppsHook + wrapGAppsHook3 python3Packages.pillow # For setup-hook gobject-introspection diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix index 16bc93304921a..db98db2b3397d 100644 --- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix +++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, wrapGAppsHook, autoreconfHook, bison, flex +{ stdenv, lib, fetchurl, wrapGAppsHook3, autoreconfHook, bison, flex , curl, gtk3, pkg-config, python3, shared-mime-info , glib-networking, gsettings-desktop-schemas @@ -123,7 +123,7 @@ in stdenv.mkDerivation rec { --subst-var-by MIMEROOTDIR ${shared-mime-info}/share ''; - nativeBuildInputs = [ autoreconfHook pkg-config bison flex wrapGAppsHook ]; + nativeBuildInputs = [ autoreconfHook pkg-config bison flex wrapGAppsHook3 ]; propagatedBuildInputs = pythonPkgs; buildInputs = diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix index a6a6efa772661..368c9f897dc79 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { pname = "evolution-ews"; - version = "3.50.3"; + version = "3.52.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "4vpZQTdq1X4H0mc/hnbDH38rBo1J9o6g+4uv6rtSm+0="; + hash = "sha256-TR9OlipFClJnADNQiaOQfZgMB2Z/q9Vmmag06Z2HSrI="; }; patches = [ diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix index a1368c3884837..dd7342eadc4f1 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix @@ -17,7 +17,7 @@ , libgweather , glib-networking , gsettings-desktop-schemas -, wrapGAppsHook +, wrapGAppsHook3 , itstool , shared-mime-info , libical @@ -44,11 +44,11 @@ stdenv.mkDerivation rec { pname = "evolution"; - version = "3.50.4"; + version = "3.52.1"; src = fetchurl { url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-4PlVyhTfsbLhaC/PoYFqA8EUuBYZmPls+daBpqOEJpg="; + hash = "sha256-aNrtER2t42GMpwjss8q0zZO6UC9a6dXnlwc8OhPinek="; }; nativeBuildInputs = [ @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { libxml2 ninja pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/networking/mailreaders/mailnag/default.nix b/pkgs/applications/networking/mailreaders/mailnag/default.nix index 4f6b3015cf34c..6c887ef66ce53 100644 --- a/pkgs/applications/networking/mailreaders/mailnag/default.nix +++ b/pkgs/applications/networking/mailreaders/mailnag/default.nix @@ -8,7 +8,7 @@ , libnotify , gst_all_1 , libsecret -, wrapGAppsHook +, wrapGAppsHook3 , gsettings-desktop-schemas , glib , gobject-introspection @@ -46,7 +46,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ gettext - wrapGAppsHook + wrapGAppsHook3 gobject-introspection # To later add plugins to xorg.lndir @@ -67,7 +67,7 @@ python3Packages.buildPythonApplication rec { # goa plugin requires gio's gnome-online-accounts which requires making sure # mailnag runs with GI_TYPELIB_PATH containing the path to Goa-1.0.typelib. # This is handled best by adding the plugins' deps to buildInputs and let - # wrapGAppsHook handle that. + # wrapGAppsHook3 handle that. pluginsDeps = lib.flatten (lib.catAttrs "buildInputs" plugs); self = mailnag; in diff --git a/pkgs/applications/networking/mailreaders/mailspring/linux.nix b/pkgs/applications/networking/mailreaders/mailspring/linux.nix index dff8796f6ce2c..47fe6697f48e4 100644 --- a/pkgs/applications/networking/mailreaders/mailspring/linux.nix +++ b/pkgs/applications/networking/mailreaders/mailspring/linux.nix @@ -11,7 +11,7 @@ , dpkg , glib , gtk3 -, wrapGAppsHook +, wrapGAppsHook3 , libkrb5 , libsecret , nss @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ autoPatchelfHook dpkg - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index 984881508929d..5026afeaea0bf 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -3,7 +3,7 @@ # To update `thunderbird-bin`'s `release_sources.nix`, run from the nixpkgs root: # # nix-shell maintainers/scripts/update.nix --argstr package pkgs.thunderbird-bin-unwrapped -{ lib, stdenv, fetchurl, config, wrapGAppsHook +{ lib, stdenv, fetchurl, config, wrapGAppsHook3 , alsa-lib , atk , cairo @@ -147,7 +147,7 @@ stdenv.mkDerivation { inherit gtk3; - nativeBuildInputs = [ wrapGAppsHook ]; + nativeBuildInputs = [ wrapGAppsHook3 ]; buildInputs = [ gtk3 adwaita-icon-theme ]; diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix index 06ec0b3045762..8b55f12732aac 100644 --- a/pkgs/applications/networking/newsreaders/liferea/default.nix +++ b/pkgs/applications/networking/newsreaders/liferea/default.nix @@ -3,7 +3,7 @@ , pkg-config , intltool , python3Packages -, wrapGAppsHook +, wrapGAppsHook3 , glib , libxml2 , libxslt @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - wrapGAppsHook + wrapGAppsHook3 python3Packages.wrapPython intltool pkg-config diff --git a/pkgs/applications/networking/p2p/deluge/default.nix b/pkgs/applications/networking/p2p/deluge/default.nix index 35db62ef8e4e5..8c3d76d755f75 100644 --- a/pkgs/applications/networking/p2p/deluge/default.nix +++ b/pkgs/applications/networking/p2p/deluge/default.nix @@ -7,7 +7,7 @@ , glib , gobject-introspection , librsvg -, wrapGAppsHook +, wrapGAppsHook3 }: let @@ -54,7 +54,7 @@ let glib ] ++ optionals withGUI [ gobject-introspection - wrapGAppsHook + wrapGAppsHook3 ]; nativeCheckInputs = with pypkgs; [ diff --git a/pkgs/applications/networking/p2p/fragments/default.nix b/pkgs/applications/networking/p2p/fragments/default.nix deleted file mode 100644 index edb31ba669577..0000000000000 --- a/pkgs/applications/networking/p2p/fragments/default.nix +++ /dev/null @@ -1,88 +0,0 @@ -{ lib -, stdenv -, fetchFromGitLab -, fetchpatch -, appstream-glib -, cargo -, dbus -, desktop-file-utils -, git -, glib -, gtk4 -, libadwaita -, meson -, ninja -, openssl -, pkg-config -, rustPlatform -, rustc -, sqlite -, transmission -, wrapGAppsHook4 -}: - -let - patchedTransmission = transmission.overrideAttrs (oldAttrs: { - patches = (oldAttrs.patches or []) ++ [ - (fetchpatch { - url = "https://raw.githubusercontent.com/flathub/de.haeckerfelix.Fragments/2aee477c8e26a24570f8dbbdbd1c49e017ae32eb/transmission_pdeathsig.patch"; - sha256 = "sha256-/rCoA566tMmzqcIfffC082Y56TwEyyQJ0knxymtscbA="; - }) - ]; - }); -in stdenv.mkDerivation rec { - pname = "fragments"; - version = "2.1.1"; - - src = fetchFromGitLab { - domain = "gitlab.gnome.org"; - owner = "World"; - repo = "Fragments"; - rev = version; - sha256 = "sha256-tZcVw4rxmNPcKKgyRB+alEktktZfKK+7FYUVAAGA9bw="; - }; - - patches = []; - cargoDeps = rustPlatform.fetchCargoTarball { - inherit src patches; - name = "${pname}-${version}"; - hash = "sha256-nqVaYnL3jKGBsAsakIkgwksjH4yuMhwCQe0zq3jgjnA="; - }; - - nativeBuildInputs = [ - appstream-glib - desktop-file-utils - git - meson - ninja - pkg-config - wrapGAppsHook4 - rustPlatform.cargoSetupHook - cargo - rustc - ]; - - buildInputs = [ - dbus - glib - gtk4 - libadwaita - openssl - sqlite - ]; - - preFixup = '' - gappsWrapperArgs+=( - --prefix PATH : "${lib.makeBinPath [ patchedTransmission ]}" - ) - ''; - - meta = with lib; { - homepage = "https://gitlab.gnome.org/World/Fragments"; - description = "Easy to use BitTorrent client for the GNOME desktop environment"; - maintainers = with maintainers; [ emilytrau ]; - license = licenses.gpl3Plus; - platforms = platforms.linux; - mainProgram = "fragments"; - }; -} diff --git a/pkgs/applications/networking/p2p/gnunet/gtk.nix b/pkgs/applications/networking/p2p/gnunet/gtk.nix index 640ffeef75880..633a8da08778a 100644 --- a/pkgs/applications/networking/p2p/gnunet/gtk.nix +++ b/pkgs/applications/networking/p2p/gnunet/gtk.nix @@ -8,7 +8,7 @@ , libsodium , libxml2 , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs= [ pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index 672a0c79fb04b..07c4ca3392f97 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -10,7 +10,7 @@ , qtbase , qtsvg , qttools -, wrapGAppsHook +, wrapGAppsHook3 , wrapQtAppsHook , guiSupport ? true @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ninja - wrapGAppsHook + wrapGAppsHook3 wrapQtAppsHook ]; diff --git a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix index 35c368a826f74..059a7371ebbf8 100644 --- a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix +++ b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix @@ -17,7 +17,7 @@ , meson , ninja , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meson ninja pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/networking/p2p/transmission/4.nix b/pkgs/applications/networking/p2p/transmission/4.nix index 75515ef414b0e..ebd8260776b98 100644 --- a/pkgs/applications/networking/p2p/transmission/4.nix +++ b/pkgs/applications/networking/p2p/transmission/4.nix @@ -26,7 +26,7 @@ , enableGTK3 ? false , gtkmm3 , xorg -, wrapGAppsHook +, wrapGAppsHook3 , enableQt5 ? false , enableQt6 ? false , qt5 @@ -105,7 +105,7 @@ stdenv.mkDerivation (finalAttrs: { cmake python3 ] - ++ optionals enableGTK3 [ wrapGAppsHook ] + ++ optionals enableGTK3 [ wrapGAppsHook3 ] ++ optionals enableQt5 [ qt5.wrapQtAppsHook ] ++ optionals enableQt6 [ qt6Packages.wrapQtAppsHook ] ; diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix index 58de6fa9754f3..2804f76f8ef96 100644 --- a/pkgs/applications/networking/p2p/transmission/default.nix +++ b/pkgs/applications/networking/p2p/transmission/default.nix @@ -21,7 +21,7 @@ , enableGTK3 ? false , gtk3 , xorg -, wrapGAppsHook +, wrapGAppsHook3 , enableQt ? false , qt5 , nixosTests @@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: { pkg-config cmake ] - ++ lib.optionals enableGTK3 [ wrapGAppsHook ] + ++ lib.optionals enableGTK3 [ wrapGAppsHook3 ] ++ lib.optionals enableQt [ qt5.wrapQtAppsHook ] ; diff --git a/pkgs/applications/networking/protonvpn-gui/default.nix b/pkgs/applications/networking/protonvpn-gui/default.nix index 2930ef450ea25..19081bd138631 100644 --- a/pkgs/applications/networking/protonvpn-gui/default.nix +++ b/pkgs/applications/networking/protonvpn-gui/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , gobject-introspection , setuptools -, wrapGAppsHook +, wrapGAppsHook3 , dbus-python , packaging , proton-core @@ -41,7 +41,7 @@ buildPythonApplication rec { # Needed for the NM namespace gobject-introspection setuptools - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = lib.optionals withIndicator [ diff --git a/pkgs/applications/networking/protonvpn-gui/legacy.nix b/pkgs/applications/networking/protonvpn-gui/legacy.nix index 7464a279cf8a9..32828b5590f67 100644 --- a/pkgs/applications/networking/protonvpn-gui/legacy.nix +++ b/pkgs/applications/networking/protonvpn-gui/legacy.nix @@ -2,7 +2,7 @@ , buildPythonApplication , fetchFromGitHub , setuptools -, wrapGAppsHook +, wrapGAppsHook3 , gdk-pixbuf , glib-networking , gobject-introspection @@ -35,7 +35,7 @@ buildPythonApplication rec { gobject-introspection imagemagick setuptools - wrapGAppsHook + wrapGAppsHook3 ]; propagatedBuildInputs = [ diff --git a/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/pkgs/applications/networking/remote/citrix-workspace/generic.nix index f751f3237e412..96074b3fd7da0 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/generic.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/generic.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, requireFile, makeWrapper, autoPatchelfHook, wrapGAppsHook, which, more +{ lib, stdenv, requireFile, makeWrapper, autoPatchelfHook, wrapGAppsHook3, which, more , file, atk, alsa-lib, cairo, fontconfig, gdk-pixbuf, glib, webkitgtk, gtk2-x11, gtk3 , heimdal, krb5, libsoup, libvorbis, speex, openssl, zlib, xorg, pango, gtk2 , gnome2, mesa, nss, nspr, gtk_engines, freetype, dconf, libpng12, libxml2 @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { makeWrapper more which - wrapGAppsHook + wrapGAppsHook3 libfaketime ]; diff --git a/pkgs/applications/networking/remote/freerdp/3.nix b/pkgs/applications/networking/remote/freerdp/3.nix new file mode 100644 index 0000000000000..45bb8db9d9d89 --- /dev/null +++ b/pkgs/applications/networking/remote/freerdp/3.nix @@ -0,0 +1,209 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, docbook-xsl-nons +, libxslt +, pkg-config +, alsa-lib +, faac +, faad2 +, ffmpeg +, fuse3 +, glib +, openh264 +, openssl +, p11-kit +, pcre2 +, pkcs11helper +, uriparser +, zlib +, libX11 +, libXcursor +, libXdamage +, libXdmcp +, libXext +, libXi +, libXinerama +, libXrandr +, libXrender +, libXtst +, libXv +, libxkbcommon +, libxkbfile +, wayland +, wayland-scanner +, icu +, libunwind +, orc +, cairo +, cjson +, libusb1 +, libpulseaudio +, cups +, pcsclite +, SDL2 +, SDL2_ttf +, SDL2_image +, systemd +, libjpeg_turbo +, libkrb5 +, libopus +, buildServer ? true +, nocaps ? false +, AudioToolbox +, AVFoundation +, Carbon +, Cocoa +, CoreMedia +, withUnfree ? false + + # tries to compile and run generate_argument_docbook.c +, withManPages ? stdenv.buildPlatform.canExecute stdenv.hostPlatform + +, buildPackages +}: + +let + cmFlag = flag: if flag then "ON" else "OFF"; +in +stdenv.mkDerivation (finalAttrs: { + pname = "freerdp"; + version = "3.4.0"; + + src = fetchFromGitHub { + owner = "FreeRDP"; + repo = "FreeRDP"; + rev = finalAttrs.version; + hash = "sha256-ZOYHhldTdV8DrOHoXS42NXB6JHBJMGRswgTczn1S6BE="; + }; + + postPatch = '' + export HOME=$TMP + + # skip NIB file generation on darwin + substituteInPlace "client/Mac/CMakeLists.txt" "client/Mac/cli/CMakeLists.txt" \ + --replace-fail "if (NOT IS_XCODE)" "if (FALSE)" + + substituteInPlace "libfreerdp/freerdp.pc.in" \ + --replace-fail "Requires:" "Requires: @WINPR_PKG_CONFIG_FILENAME@" + '' + lib.optionalString (pcsclite != null) '' + substituteInPlace "winpr/libwinpr/smartcard/smartcard_pcsc.c" \ + --replace-fail "libpcsclite.so" "${lib.getLib pcsclite}/lib/libpcsclite.so" + '' + lib.optionalString nocaps '' + substituteInPlace "libfreerdp/locale/keyboard_xkbfile.c" \ + --replace-fail "RDP_SCANCODE_CAPSLOCK" "RDP_SCANCODE_LCONTROL" + ''; + + nativeBuildInputs = [ + cmake + libxslt + docbook-xsl-nons + pkg-config + wayland-scanner + ]; + + buildInputs = [ + cairo + cjson + cups + faad2 + ffmpeg + glib + icu + libX11 + libXcursor + libXdamage + libXdmcp + libXext + libXi + libXinerama + libXrandr + libXrender + libXtst + libXv + libjpeg_turbo + libkrb5 + libopus + libpulseaudio + libunwind + libusb1 + libxkbcommon + libxkbfile + openh264 + openssl + orc + pcre2 + pcsclite + pkcs11helper + SDL2 + SDL2_ttf + SDL2_image + uriparser + zlib + ] ++ lib.optionals stdenv.isLinux [ + alsa-lib + fuse3 + systemd + wayland + ] ++ lib.optionals stdenv.isDarwin [ + AudioToolbox + AVFoundation + Carbon + Cocoa + CoreMedia + ] ++ lib.optionals withUnfree [ + faac + ]; + + # https://github.com/FreeRDP/FreeRDP/issues/8526#issuecomment-1357134746 + cmakeFlags = [ + "-Wno-dev" + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DDOCBOOKXSL_DIR=${docbook-xsl-nons}/xml/xsl/docbook" + "-DWAYLAND_SCANNER=${buildPackages.wayland-scanner}/bin/wayland-scanner" + ] ++ lib.mapAttrsToList (k: v: "-D${k}=${cmFlag v}") { + BUILD_TESTING = false; # false is recommended by upstream + WITH_CAIRO = (cairo != null); + WITH_CUPS = (cups != null); + WITH_FAAC = (withUnfree && faac != null); + WITH_FAAD2 = (faad2 != null); + WITH_FUSE = (stdenv.isLinux && fuse3 != null); + WITH_JPEG = (libjpeg_turbo != null); + WITH_KRB5 = (libkrb5 != null); + WITH_OPENH264 = (openh264 != null); + WITH_OPUS = (libopus != null); + WITH_OSS = false; + WITH_MANPAGES = withManPages; + WITH_PCSC = (pcsclite != null); + WITH_PULSE = (libpulseaudio != null); + WITH_SERVER = buildServer; + WITH_WEBVIEW = false; # avoid introducing webkit2gtk-4.0 + WITH_VAAPI = false; # false is recommended by upstream + WITH_X11 = true; + }; + + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin [ + "-DTARGET_OS_IPHONE=0" + "-DTARGET_OS_WATCH=0" + "-include AudioToolbox/AudioToolbox.h" + ] ++ lib.optionals stdenv.cc.isClang [ + "-Wno-error=incompatible-function-pointer-types" + ]); + + env.NIX_LDFLAGS = toString (lib.optionals stdenv.isDarwin [ + "-framework AudioToolbox" + ]); + + meta = with lib; { + description = "A Remote Desktop Protocol Client"; + longDescription = '' + FreeRDP is a client-side implementation of the Remote Desktop Protocol (RDP) + following the Microsoft Open Specifications. + ''; + homepage = "https://www.freerdp.com/"; + license = licenses.asl20; + maintainers = with maintainers; [ peterhoeg lheckemann ]; + platforms = platforms.unix; + }; +}) diff --git a/pkgs/applications/networking/remote/nice-dcv-client/default.nix b/pkgs/applications/networking/remote/nice-dcv-client/default.nix index 0722561cb6f3b..6898d0f66d47c 100644 --- a/pkgs/applications/networking/remote/nice-dcv-client/default.nix +++ b/pkgs/applications/networking/remote/nice-dcv-client/default.nix @@ -20,7 +20,7 @@ , python3Packages , cpio , autoPatchelfHook -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-iLz25SB5v7ghkAZOMGPmpNaPihd8ikzCQS//r1xBNRU="; }; - nativeBuildInputs = [ autoPatchelfHook wrapGAppsHook python3Packages.rpm ]; + nativeBuildInputs = [ autoPatchelfHook wrapGAppsHook3 python3Packages.rpm ]; unpackPhase = '' rpm2cpio $src | ${cpio}/bin/cpio -idm ''; diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index 0fd2de49dac3e..a2455330c2225 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, cmake, ninja, pkg-config, wrapGAppsHook +{ lib, stdenv, fetchFromGitLab, cmake, ninja, pkg-config, wrapGAppsHook3 , desktopToDarwinBundle , glib, gtk3, gettext, libxkbfile, libX11, python3 , freerdp, libssh, libgcrypt, gnutls, vte @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "sha256-3HyG2PBnTq/fVsvWA81fQ2gCOoAxINWeUDwzKcOuECk="; }; - nativeBuildInputs = [ cmake ninja pkg-config wrapGAppsHook ] + nativeBuildInputs = [ cmake ninja pkg-config wrapGAppsHook3 ] ++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle ]; buildInputs = [ diff --git a/pkgs/applications/networking/remote/rustdesk/default.nix b/pkgs/applications/networking/remote/rustdesk/default.nix index d220b87f2a22d..d1b0facf7f5b9 100644 --- a/pkgs/applications/networking/remote/rustdesk/default.nix +++ b/pkgs/applications/networking/remote/rustdesk/default.nix @@ -2,7 +2,7 @@ , rustPlatform , fetchFromGitHub , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , atk , bzip2 , cairo @@ -87,7 +87,7 @@ rustPlatform.buildRustPackage rec { copyDesktopItems pkg-config rustPlatform.bindgenHook - wrapGAppsHook + wrapGAppsHook3 ]; buildFeatures = lib.optionals stdenv.isLinux [ "linux-pkg-config" ]; diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index d91b2540f7645..d7d9d68bf3327 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -42,7 +42,7 @@ , spandsp3 , speexdsp , SystemConfiguration -, wrapGAppsHook +, wrapGAppsHook3 , zlib , zstd @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { python3 ] ++ lib.optionals withQt [ qt6.wrapQtAppsHook - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/networking/sync/rsync/configure.ac-fix-failing-IPv6-check.patch b/pkgs/applications/networking/sync/rsync/configure.ac-fix-failing-IPv6-check.patch deleted file mode 100644 index 3305653d025ff..0000000000000 --- a/pkgs/applications/networking/sync/rsync/configure.ac-fix-failing-IPv6-check.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -rup rsync-3.2.7/configure.sh rsync-3.2.7-fixed/configure.sh ---- rsync-3.2.7/configure.sh 2022-10-20 17:57:22 -+++ rsync-3.2.7-fixed/configure.sh 2024-01-01 19:51:58 -@@ -7706,7 +7706,7 @@ else $as_nop - #include <stdlib.h> - #include <sys/types.h> - #include <sys/socket.h> --main() -+int main() - { - if (socket(AF_INET6, SOCK_STREAM, 0) < 0) - exit(1); diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix index 8fb607979100d..8846bea0a49b4 100644 --- a/pkgs/applications/networking/sync/rsync/default.nix +++ b/pkgs/applications/networking/sync/rsync/default.nix @@ -20,24 +20,16 @@ stdenv.mkDerivation rec { pname = "rsync"; - version = "3.2.7"; + version = "3.3.0"; src = fetchurl { # signed with key 0048 C8B0 26D4 C96F 0E58 9C2F 6C85 9FB1 4B96 A8C5 url = "mirror://samba/rsync/src/rsync-${version}.tar.gz"; - sha256 = "sha256-Tn2dP27RCHjFjF+3JKZ9rPS2qsc0CxPkiPstxBNG8rs="; + hash = "sha256-c5nppnCMMtZ4pypjIZ6W8jvgviM25Q/RNISY0HBB35A="; }; nativeBuildInputs = [ perl ]; - patches = [ - # https://github.com/WayneD/rsync/issues/511#issuecomment-1774612577 - # original source: https://build.opensuse.org/package/view_file/network/rsync/rsync-fortified-strlcpy-fix.patch?expand=1&rev=3f8dd2f4a404c96c0f69176e60893714 - ./rsync-fortified-strlcpy-fix.patch - # https://github.com/WayneD/rsync/pull/558 - ./configure.ac-fix-failing-IPv6-check.patch - ]; - buildInputs = [ libiconv zlib popt ] ++ lib.optional enableACLs acl ++ lib.optional enableZstd zstd diff --git a/pkgs/applications/networking/sync/rsync/rsync-fortified-strlcpy-fix.patch b/pkgs/applications/networking/sync/rsync/rsync-fortified-strlcpy-fix.patch deleted file mode 100644 index 296445b4bb563..0000000000000 --- a/pkgs/applications/networking/sync/rsync/rsync-fortified-strlcpy-fix.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 1f83963f59960150e8c46112daa8411324c1f209 Mon Sep 17 00:00:00 2001 -From: Jiri Slaby <jslaby@suse.cz> -Date: Fri, 18 Aug 2023 08:26:20 +0200 -Subject: [PATCH] exclude: fix crashes with fortified strlcpy() - -Fortified (-D_FORTIFY_SOURCE=2 for gcc) builds make strlcpy() crash when -its third parameter (size) is larger than the buffer: - $ rsync -FFXHav '--filter=merge global-rsync-filter' Align-37-43/ xxx - sending incremental file list - *** buffer overflow detected ***: terminated - -It's in the exclude code in setup_merge_file(): - strlcpy(y, save, MAXPATHLEN); - -Note the 'y' pointer was incremented, so it no longer points to memory -with MAXPATHLEN "owned" bytes. - -Fix it by remembering the number of copied bytes into the 'save' buffer -and use that instead of MAXPATHLEN which is clearly incorrect. - -Fixes #511. ---- - exclude.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/exclude.c b/exclude.c -index ffe55b167..1a5de3b9e 100644 ---- a/exclude.c -+++ b/exclude.c -@@ -720,7 +720,8 @@ static BOOL setup_merge_file(int mergelist_num, filter_rule *ex, - parent_dirscan = True; - while (*y) { - char save[MAXPATHLEN]; -- strlcpy(save, y, MAXPATHLEN); -+ /* copylen is strlen(y) which is < MAXPATHLEN. +1 for \0 */ -+ size_t copylen = strlcpy(save, y, MAXPATHLEN) + 1; - *y = '\0'; - dirbuf_len = y - dirbuf; - strlcpy(x, ex->pattern, MAXPATHLEN - (x - buf)); -@@ -734,7 +735,7 @@ static BOOL setup_merge_file(int mergelist_num, filter_rule *ex, - lp->head = NULL; - } - lp->tail = NULL; -- strlcpy(y, save, MAXPATHLEN); -+ strlcpy(y, save, copylen); - while ((*x++ = *y++) != '/') {} - } - parent_dirscan = False; - diff --git a/pkgs/applications/networking/termius/default.nix b/pkgs/applications/networking/termius/default.nix index deaa49e4f66d5..0f16865ac8e3c 100644 --- a/pkgs/applications/networking/termius/default.nix +++ b/pkgs/applications/networking/termius/default.nix @@ -9,7 +9,7 @@ , libsecret , mesa , udev -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { dontWrapGApps = true; # TODO: migrate off autoPatchelfHook and use nixpkgs' electron - nativeBuildInputs = [ autoPatchelfHook squashfsTools makeWrapper wrapGAppsHook ]; + nativeBuildInputs = [ autoPatchelfHook squashfsTools makeWrapper wrapGAppsHook3 ]; buildInputs = [ alsa-lib diff --git a/pkgs/applications/networking/trayscale/default.nix b/pkgs/applications/networking/trayscale/default.nix index e5ab2e2a1a85d..26e767ef90695 100644 --- a/pkgs/applications/networking/trayscale/default.nix +++ b/pkgs/applications/networking/trayscale/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "trayscale"; - version = "0.11.2"; + version = "0.12.0"; src = fetchFromGitHub { owner = "DeedleFake"; repo = "trayscale"; rev = "v${version}"; - hash = "sha256-Og/ilxWNB5TNqnViZ5TeE0P+RxG1JOP2q9jo91SBNZQ="; + hash = "sha256-GAK95XlRVGpoVcEmeFO3SddHpdn0qO7qs2IOj7qzRXQ="; }; - vendorHash = "sha256-eIakjEYfVp2wfXu0oqBmd5hJZTp0xgYKNNbtpRBnT2w="; + vendorHash = "sha256-Iedd8WsJPAVQexRqDSLAmv7MAWc4IFQXHk6XpnStMps="; subPackages = [ "cmd/trayscale" ]; diff --git a/pkgs/applications/networking/upnp-router-control/default.nix b/pkgs/applications/networking/upnp-router-control/default.nix index 761975a277bc4..8991e66b7c24f 100644 --- a/pkgs/applications/networking/upnp-router-control/default.nix +++ b/pkgs/applications/networking/upnp-router-control/default.nix @@ -6,7 +6,7 @@ , meson , ninja , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , gssdp_1_6 , gtk3 , gupnp_1_6 @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { meson ninja pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/networking/weather/meteo/default.nix b/pkgs/applications/networking/weather/meteo/default.nix index 9b64e8e6c1cb7..ddee458a0569f 100644 --- a/pkgs/applications/networking/weather/meteo/default.nix +++ b/pkgs/applications/networking/weather/meteo/default.nix @@ -9,7 +9,7 @@ , pkg-config , python3 , vala -, wrapGAppsHook +, wrapGAppsHook3 , glib , gtk3 , json-glib @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { pkg-config python3 vala - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/networking/yaup/default.nix b/pkgs/applications/networking/yaup/default.nix index cc6ba09076cd0..f3854cecd6a8e 100644 --- a/pkgs/applications/networking/yaup/default.nix +++ b/pkgs/applications/networking/yaup/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , intltool , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , gtk3 , miniupnpc }: @@ -22,7 +22,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ intltool pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/office/abiword/default.nix b/pkgs/applications/office/abiword/default.nix index 0ca18f8e360b5..d03b60da6e733 100644 --- a/pkgs/applications/office/abiword/default.nix +++ b/pkgs/applications/office/abiword/default.nix @@ -17,7 +17,7 @@ , boost , libxslt , goffice -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config - wrapGAppsHook + wrapGAppsHook3 perl ]; diff --git a/pkgs/applications/office/agenda/default.nix b/pkgs/applications/office/agenda/default.nix index bcffa8ebf7888..8957df0bad194 100644 --- a/pkgs/applications/office/agenda/default.nix +++ b/pkgs/applications/office/agenda/default.nix @@ -11,7 +11,7 @@ , glib , gtk3 , libgee -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { pkg-config python3 vala - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/office/autokey/default.nix b/pkgs/applications/office/autokey/default.nix index af8ceeb4b7bed..d05c83cb19992 100644 --- a/pkgs/applications/office/autokey/default.nix +++ b/pkgs/applications/office/autokey/default.nix @@ -1,7 +1,7 @@ { lib , python3Packages , fetchFromGitHub -, wrapGAppsHook +, wrapGAppsHook3 , gobject-introspection , gtksourceview3 , libappindicator-gtk3 @@ -24,7 +24,7 @@ python3Packages.buildPythonApplication rec { # Tests appear to be broken with import errors within the project structure doCheck = false; - nativeBuildInputs = [ wrapGAppsHook gobject-introspection ]; + nativeBuildInputs = [ wrapGAppsHook3 gobject-introspection ]; buildInputs = [ gtksourceview3 diff --git a/pkgs/applications/office/banana-accounting/default.nix b/pkgs/applications/office/banana-accounting/default.nix index e1c5f7fdeb40a..a0213e05f60ce 100644 --- a/pkgs/applications/office/banana-accounting/default.nix +++ b/pkgs/applications/office/banana-accounting/default.nix @@ -10,7 +10,7 @@ , lib , stdenv , libgcrypt -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation { @@ -40,7 +40,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoPatchelfHook - wrapGAppsHook + wrapGAppsHook3 ]; installPhase = '' diff --git a/pkgs/applications/office/beamerpresenter/default.nix b/pkgs/applications/office/beamerpresenter/default.nix index c3e080ad3d524..65fe907c27668 100644 --- a/pkgs/applications/office/beamerpresenter/default.nix +++ b/pkgs/applications/office/beamerpresenter/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , cmake , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , wrapQtAppsHook , gst_all_1 , qtbase @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config - wrapGAppsHook + wrapGAppsHook3 wrapQtAppsHook ]; diff --git a/pkgs/applications/office/bookworm/default.nix b/pkgs/applications/office/bookworm/default.nix index 13d3c46c946d1..c64c3389d95d8 100644 --- a/pkgs/applications/office/bookworm/default.nix +++ b/pkgs/applications/office/bookworm/default.nix @@ -24,7 +24,7 @@ , unzip , vala , webkitgtk -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { ninja pkg-config vala - wrapGAppsHook + wrapGAppsHook3 gobject-introspection ]; diff --git a/pkgs/applications/office/clockify/default.nix b/pkgs/applications/office/clockify/default.nix index 7b2faa6b7d203..6acb243acec76 100644 --- a/pkgs/applications/office/clockify/default.nix +++ b/pkgs/applications/office/clockify/default.nix @@ -14,8 +14,6 @@ appimageTools.wrapType2 rec { extraInstallCommands = let appimageContents = appimageTools.extract { inherit pname version src; }; in '' - mv $out/bin/${pname}-${version} $out/bin/${pname} - install -Dm 444 ${appimageContents}/clockify.desktop -t $out/share/applications install -Dm 444 ${appimageContents}/clockify.png -t $out/share/pixmaps diff --git a/pkgs/applications/office/gnote/default.nix b/pkgs/applications/office/gnote/default.nix index 0d8c1d2803965..a4262de9937f7 100644 --- a/pkgs/applications/office/gnote/default.nix +++ b/pkgs/applications/office/gnote/default.nix @@ -5,6 +5,7 @@ , gettext , gtkmm4 , itstool +, libadwaita , libsecret , libuuid , libxml2 @@ -18,15 +19,16 @@ stdenv.mkDerivation rec { pname = "gnote"; - version = "45.1"; + version = "46.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-nuwn+MsKENL9uRSkUei4QYwmDni/BzYHgaeKXkGM+UE="; + hash = "sha256-ht9YoVlbIVN0aRq0S/wWE7Sf28p3CEI6PVZY3NOgFe0="; }; buildInputs = [ gtkmm4 + libadwaita libsecret libuuid libxml2 diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index da94f9674ca28..1551f2cad4287 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -23,7 +23,7 @@ , pkg-config , swig , webkitgtk -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { cmake gettext makeWrapper - wrapGAppsHook + wrapGAppsHook3 pkg-config ]; @@ -117,11 +117,11 @@ stdenv.mkDerivation rec { ) ''; - # wrapGAppsHook would wrap all binaries including the cli utils which need + # wrapGAppsHook3 would wrap all binaries including the cli utils which need # Perl wrapping dontWrapGApps = true; - # gnucash is wrapped using the args constructed for wrapGAppsHook. + # gnucash is wrapped using the args constructed for wrapGAppsHook3. # gnc-fq-* are cli utils written in Perl hence the extra wrapping postFixup = '' wrapProgram $out/bin/gnucash "''${gappsWrapperArgs[@]}" diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix index 7e351afadf536..a3c16d5d86fe1 100644 --- a/pkgs/applications/office/gnumeric/default.nix +++ b/pkgs/applications/office/gnumeric/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, intltool, perlPackages -, goffice, gnome, wrapGAppsHook, gtk3, bison, python3Packages +, goffice, gnome, wrapGAppsHook3, gtk3, bison, python3Packages , itstool }: @@ -16,7 +16,7 @@ in stdenv.mkDerivation rec { configureFlags = [ "--disable-component" ]; - nativeBuildInputs = [ pkg-config intltool bison itstool wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config intltool bison itstool wrapGAppsHook3 ]; # ToDo: optional libgda, introspection? buildInputs = [ diff --git a/pkgs/applications/office/grisbi/default.nix b/pkgs/applications/office/grisbi/default.nix index b0242fc4ae436..586777ccf41e0 100644 --- a/pkgs/applications/office/grisbi/default.nix +++ b/pkgs/applications/office/grisbi/default.nix @@ -5,7 +5,7 @@ , libgsf , libofx , intltool -, wrapGAppsHook +, wrapGAppsHook3 , libsoup , gnome }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-vTrbq/xLTfwF7/YtKzZFiiSw8A0HzzWin2ry8gPHej8="; }; - nativeBuildInputs = [ pkg-config wrapGAppsHook intltool ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook3 intltool ]; buildInputs = [ gtk libgsf diff --git a/pkgs/applications/office/gtg/default.nix b/pkgs/applications/office/gtg/default.nix index 18ccdf2db26ec..39c4353cb72cb 100644 --- a/pkgs/applications/office/gtg/default.nix +++ b/pkgs/applications/office/gtg/default.nix @@ -5,7 +5,7 @@ , python3Packages , ninja , gtk3 -, wrapGAppsHook +, wrapGAppsHook3 , glib , gtksourceview4 , itstool @@ -33,7 +33,7 @@ python3Packages.buildPythonApplication rec { ninja itstool gettext - wrapGAppsHook + wrapGAppsHook3 gobject-introspection ]; diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix index 023a5729ed801..116909d9842c6 100644 --- a/pkgs/applications/office/homebank/default.nix +++ b/pkgs/applications/office/homebank/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, gtk, pkg-config, libofx, intltool, wrapGAppsHook +{ fetchurl, lib, stdenv, gtk, pkg-config, libofx, intltool, wrapGAppsHook3 , libsoup_3, gnome }: stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { hash = "sha256-Qs5xRsh16gyjyTORtqm/RxTbRiHGP0oJTcxviYW7VOQ="; }; - nativeBuildInputs = [ pkg-config wrapGAppsHook intltool ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook3 intltool ]; buildInputs = [ gtk libofx libsoup_3 gnome.adwaita-icon-theme]; meta = with lib; { diff --git a/pkgs/applications/office/jabref/default.nix b/pkgs/applications/office/jabref/default.nix index 282e62584cff4..d49e8c8a98e89 100644 --- a/pkgs/applications/office/jabref/default.nix +++ b/pkgs/applications/office/jabref/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchurl , fetchFromGitHub -, wrapGAppsHook +, wrapGAppsHook3 , makeDesktopItem , copyDesktopItems , unzip @@ -125,7 +125,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ jdk gradle - wrapGAppsHook + wrapGAppsHook3 copyDesktopItems unzip ]; diff --git a/pkgs/applications/office/jameica/default.nix b/pkgs/applications/office/jameica/default.nix index 66d2a80c55550..f87eaf6d9e4d4 100644 --- a/pkgs/applications/office/jameica/default.nix +++ b/pkgs/applications/office/jameica/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , makeDesktopItem , makeWrapper -, wrapGAppsHook +, wrapGAppsHook3 , stripJavaArchivesHook , ant , jdk @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { hash = "sha256-MSVSd5DyVL+dcfTDv1M99hxickPwT2Pt6QGNsu6DGZI="; }; - nativeBuildInputs = [ ant jdk wrapGAppsHook makeWrapper stripJavaArchivesHook ]; + nativeBuildInputs = [ ant jdk wrapGAppsHook3 makeWrapper stripJavaArchivesHook ]; buildInputs = lib.optionals stdenv.isLinux [ gtk2 glib libXtst ] ++ lib.optional stdenv.isDarwin Cocoa; diff --git a/pkgs/applications/office/libreoffice/wrapper.nix b/pkgs/applications/office/libreoffice/wrapper.nix index 2f3927146f801..013a2ee5575ef 100644 --- a/pkgs/applications/office/libreoffice/wrapper.nix +++ b/pkgs/applications/office/libreoffice/wrapper.nix @@ -6,7 +6,7 @@ , xorg # for lndir , runCommand , substituteAll -# For Emulating wrapGAppsHook +# For Emulating wrapGAppsHook3 , gsettings-desktop-schemas , hicolor-icon-theme , dconf diff --git a/pkgs/applications/office/mmex/default.nix b/pkgs/applications/office/mmex/default.nix index e1f39e8964c5e..c4508df84b7b6 100644 --- a/pkgs/applications/office/mmex/default.nix +++ b/pkgs/applications/office/mmex/default.nix @@ -7,7 +7,7 @@ , makeWrapper , lsb-release , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , curl , sqlite , wxGTK32 @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { git makeWrapper pkg-config - wrapGAppsHook + wrapGAppsHook3 ] ++ lib.optionals stdenv.isLinux [ lsb-release ]; diff --git a/pkgs/applications/office/notes-up/default.nix b/pkgs/applications/office/notes-up/default.nix index ca1f1c15952a4..4bc6060cfa6b2 100644 --- a/pkgs/applications/office/notes-up/default.nix +++ b/pkgs/applications/office/notes-up/default.nix @@ -8,7 +8,7 @@ , pkg-config , python3 , vala -, wrapGAppsHook +, wrapGAppsHook3 , discount , glib , gtk3 @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { pkg-config python3 vala - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/office/osmo/default.nix b/pkgs/applications/office/osmo/default.nix index 8f73d9c6b2e84..7dc7444379cc7 100644 --- a/pkgs/applications/office/osmo/default.nix +++ b/pkgs/applications/office/osmo/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, gtk3, libxml2, gettext, libical, libnotify -, libarchive, gspell, webkitgtk, libgringotts, wrapGAppsHook }: +, libarchive, gspell, webkitgtk, libgringotts, wrapGAppsHook3 }: stdenv.mkDerivation rec { pname = "osmo"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "19h3dnjgqbawnvgnycyp4n5b6mjsp5zghn3b69b6f3xa3fyi32qy"; }; - nativeBuildInputs = [ pkg-config gettext wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config gettext wrapGAppsHook3 ]; buildInputs = [ gtk3 libxml2 libical libnotify libarchive gspell webkitgtk libgringotts ]; diff --git a/pkgs/applications/office/paperwork/paperwork-gtk.nix b/pkgs/applications/office/paperwork/paperwork-gtk.nix index e783e8f4966fe..9e6beb5053a40 100644 --- a/pkgs/applications/office/paperwork/paperwork-gtk.nix +++ b/pkgs/applications/office/paperwork/paperwork-gtk.nix @@ -7,7 +7,7 @@ , xvfb-run , dbus , libnotify -, wrapGAppsHook +, wrapGAppsHook3 , fetchFromGitLab , which , gettext @@ -80,7 +80,7 @@ python3Packages.buildPythonApplication rec { nativeCheckInputs = [ dbus ]; nativeBuildInputs = [ - wrapGAppsHook + wrapGAppsHook3 gobject-introspection python3Packages.setuptools-scm (lib.getBin gettext) diff --git a/pkgs/applications/office/portfolio/default.nix b/pkgs/applications/office/portfolio/default.nix index a7b5835184901..c320729ee9ee6 100644 --- a/pkgs/applications/office/portfolio/default.nix +++ b/pkgs/applications/office/portfolio/default.nix @@ -10,7 +10,7 @@ , libsecret , makeDesktopItem , webkitgtk -, wrapGAppsHook +, wrapGAppsHook3 , writeScript }: let @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoPatchelfHook - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/office/pympress/default.nix b/pkgs/applications/office/pympress/default.nix index 353e46e067dac..eb28bf2dfd920 100644 --- a/pkgs/applications/office/pympress/default.nix +++ b/pkgs/applications/office/pympress/default.nix @@ -2,7 +2,7 @@ , stdenv , python3Packages , fetchPypi -, wrapGAppsHook +, wrapGAppsHook3 , gtk3 , gobject-introspection , libcanberra-gtk3 @@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec { }; nativeBuildInputs = [ - wrapGAppsHook + wrapGAppsHook3 gobject-introspection ]; diff --git a/pkgs/applications/office/spice-up/default.nix b/pkgs/applications/office/spice-up/default.nix index 93376ed2922b9..f8a7f3a7c268c 100644 --- a/pkgs/applications/office/spice-up/default.nix +++ b/pkgs/applications/office/spice-up/default.nix @@ -7,7 +7,7 @@ , pkg-config , python3 , vala -, wrapGAppsHook +, wrapGAppsHook3 , glib , gtk3 , json-glib @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { pkg-config python3 vala - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/office/ticktick/default.nix b/pkgs/applications/office/ticktick/default.nix index 3a768c702acdf..a7b88321a82d6 100644 --- a/pkgs/applications/office/ticktick/default.nix +++ b/pkgs/applications/office/ticktick/default.nix @@ -1,7 +1,7 @@ { lib , fetchurl , stdenv -, wrapGAppsHook +, wrapGAppsHook3 , dpkg , autoPatchelfHook , glibc @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ - wrapGAppsHook + wrapGAppsHook3 autoPatchelfHook dpkg ]; diff --git a/pkgs/applications/office/timeline/default.nix b/pkgs/applications/office/timeline/default.nix index 9f8bb5b563d57..8aedc4854006b 100644 --- a/pkgs/applications/office/timeline/default.nix +++ b/pkgs/applications/office/timeline/default.nix @@ -4,7 +4,7 @@ , gettext , makeDesktopItem , copyDesktopItems -, wrapGAppsHook +, wrapGAppsHook3 }: python3.pkgs.buildPythonApplication rec { @@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication rec { sha256 = "sha256-qwH2mt3Va62QJKJGOpt5WV3QksqQaRGEif4CcPC5F2E="; }; - nativeBuildInputs = [ python3.pkgs.wrapPython copyDesktopItems wrapGAppsHook ]; + nativeBuildInputs = [ python3.pkgs.wrapPython copyDesktopItems wrapGAppsHook3 ]; pythonPath = with python3.pkgs; [ wxpython diff --git a/pkgs/applications/office/treesheets/default.nix b/pkgs/applications/office/treesheets/default.nix index c67f53949ce72..fc88bf6b58817 100644 --- a/pkgs/applications/office/treesheets/default.nix +++ b/pkgs/applications/office/treesheets/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , cmake , ninja -, wrapGAppsHook +, wrapGAppsHook3 , makeWrapper , wxGTK , Cocoa @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ninja - wrapGAppsHook + wrapGAppsHook3 makeWrapper ]; diff --git a/pkgs/applications/office/trilium/desktop.nix b/pkgs/applications/office/trilium/desktop.nix index 55b99bf71b794..e2ad6d5d5f826 100644 --- a/pkgs/applications/office/trilium/desktop.nix +++ b/pkgs/applications/office/trilium/desktop.nix @@ -1,7 +1,7 @@ { stdenv, lib, unzip, autoPatchelfHook , fetchurl, makeWrapper , alsa-lib, mesa, nss, nspr, systemd -, makeDesktopItem, copyDesktopItems, wrapGAppsHook +, makeDesktopItem, copyDesktopItems, wrapGAppsHook3 , metaCommon }: @@ -29,7 +29,7 @@ let nativeBuildInputs = [ autoPatchelfHook makeWrapper - wrapGAppsHook + wrapGAppsHook3 copyDesktopItems ]; diff --git a/pkgs/applications/office/tryton/default.nix b/pkgs/applications/office/tryton/default.nix index e1a236e5db8bc..e62d26b3c9fcc 100644 --- a/pkgs/applications/office/tryton/default.nix +++ b/pkgs/applications/office/tryton/default.nix @@ -14,7 +14,7 @@ , pango , fontconfig , freetype -, wrapGAppsHook +, wrapGAppsHook3 }: with lib; @@ -33,7 +33,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ pkg-config gobject-introspection - wrapGAppsHook + wrapGAppsHook3 ]; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/applications/office/zim/default.nix b/pkgs/applications/office/zim/default.nix index b21f3edaa5322..9680748287b9b 100644 --- a/pkgs/applications/office/zim/default.nix +++ b/pkgs/applications/office/zim/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python3Packages, gtk3, gobject-introspection, wrapGAppsHook, gnome }: +{ lib, stdenv, fetchurl, python3Packages, gtk3, gobject-introspection, wrapGAppsHook3, gnome }: # TODO: Declare configuration options for the following optional dependencies: # - File stores: hg, git, bzr @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec { buildInputs = [ gtk3 gnome.adwaita-icon-theme ]; propagatedBuildInputs = with python3Packages; [ pyxdg pygobject3 ]; - nativeBuildInputs = [ gobject-introspection wrapGAppsHook ]; + nativeBuildInputs = [ gobject-introspection wrapGAppsHook3 ]; dontWrapGApps = true; diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix index e343790da2c7d..b31ce7f8c2de7 100644 --- a/pkgs/applications/office/zotero/default.nix +++ b/pkgs/applications/office/zotero/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchurl -, wrapGAppsHook +, wrapGAppsHook3 , makeDesktopItem , atk , cairo @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { hash = "sha256-HAVLmamEPuFf0548/iEXes+f4XnQ7kU1u9hyOYhVyZ0="; }; - nativeBuildInputs = [ wrapGAppsHook ]; + nativeBuildInputs = [ wrapGAppsHook3 ]; buildInputs = [ gsettings-desktop-schemas glib gtk3 gnome.adwaita-icon-theme dconf ]; diff --git a/pkgs/applications/office/zotero/zotero_7.nix b/pkgs/applications/office/zotero/zotero_7.nix index 4d4ea36c5acf8..ae8cc9e9fa6f6 100644 --- a/pkgs/applications/office/zotero/zotero_7.nix +++ b/pkgs/applications/office/zotero/zotero_7.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchurl -, wrapGAppsHook +, wrapGAppsHook3 , autoPatchelfHook , makeDesktopItem , atk @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - wrapGAppsHook + wrapGAppsHook3 autoPatchelfHook ]; buildInputs = [ diff --git a/pkgs/applications/radio/chirp/default.nix b/pkgs/applications/radio/chirp/default.nix index 0bb054e3d52ed..cab870c5e588f 100644 --- a/pkgs/applications/radio/chirp/default.nix +++ b/pkgs/applications/radio/chirp/default.nix @@ -5,7 +5,7 @@ , gsettings-desktop-schemas , python3 , unstableGitUpdater -, wrapGAppsHook +, wrapGAppsHook3 }: python3.pkgs.buildPythonApplication rec { @@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication rec { gsettings-desktop-schemas ]; nativeBuildInputs = [ - wrapGAppsHook + wrapGAppsHook3 ]; propagatedBuildInputs = with python3.pkgs; [ future diff --git a/pkgs/applications/radio/cqrlog/default.nix b/pkgs/applications/radio/cqrlog/default.nix index af1e283249d86..7c973e097d533 100644 --- a/pkgs/applications/radio/cqrlog/default.nix +++ b/pkgs/applications/radio/cqrlog/default.nix @@ -16,7 +16,7 @@ , xdg-utils , xplanet , autoPatchelfHook -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { ! grep -C src -RC0 "/usr" ''; - nativeBuildInputs = [ lazarus fpc autoPatchelfHook wrapGAppsHook ]; + nativeBuildInputs = [ lazarus fpc autoPatchelfHook wrapGAppsHook3 ]; buildInputs = [ atk cairo diff --git a/pkgs/applications/radio/gnuradio/wrapper.nix b/pkgs/applications/radio/gnuradio/wrapper.nix index fdaa76f6f7e8e..9ec00058f1b8c 100644 --- a/pkgs/applications/radio/gnuradio/wrapper.nix +++ b/pkgs/applications/radio/gnuradio/wrapper.nix @@ -11,7 +11,7 @@ , xorg # To define a the gnuradio.pkgs scope , newScope -# For Emulating wrapGAppsHook +# For Emulating wrapGAppsHook3 , gsettings-desktop-schemas , glib , hicolor-icon-theme @@ -76,7 +76,7 @@ let inherit (unwrapped) version; makeWrapperArgs = builtins.concatStringsSep " " ([ ] - # Emulating wrapGAppsHook & wrapQtAppsHook working together + # Emulating wrapGAppsHook3 & wrapQtAppsHook working together ++ lib.optionals ( (unwrapped.hasFeature "gnuradio-companion") || (unwrapped.hasFeature "gr-qtgui") diff --git a/pkgs/applications/radio/gqrx/default.nix b/pkgs/applications/radio/gqrx/default.nix index a574066045718..14675124b0edd 100644 --- a/pkgs/applications/radio/gqrx/default.nix +++ b/pkgs/applications/radio/gqrx/default.nix @@ -11,7 +11,7 @@ , fftwFloat , alsa-lib , libjack2 -, wrapGAppsHook +, wrapGAppsHook3 , wrapQtAppsHook # drivers (optional): , rtl-sdr @@ -40,7 +40,7 @@ gnuradioMinimal.pkgs.mkDerivation rec { cmake pkg-config wrapQtAppsHook - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ gnuradioMinimal.unwrapped.logLib diff --git a/pkgs/applications/radio/gridtracker/default.nix b/pkgs/applications/radio/gridtracker/default.nix index 5769fbbdf1c86..645aed7fffd6f 100644 --- a/pkgs/applications/radio/gridtracker/default.nix +++ b/pkgs/applications/radio/gridtracker/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, nix-update-script, nwjs, wrapGAppsHook }: +{ lib, stdenv, fetchFromGitLab, nix-update-script, nwjs, wrapGAppsHook3 }: stdenv.mkDerivation rec { pname = "gridtracker"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-p3PdYOk0yvG3QkM17grzZmf9upK1n0zo4aOrlhGTvTU="; }; - nativeBuildInputs = [ wrapGAppsHook ]; + nativeBuildInputs = [ wrapGAppsHook3 ]; postPatch = '' substituteInPlace Makefile \ diff --git a/pkgs/applications/radio/grig/default.nix b/pkgs/applications/radio/grig/default.nix index b288317c03c7b..84664d897203a 100644 --- a/pkgs/applications/radio/grig/default.nix +++ b/pkgs/applications/radio/grig/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , autoreconfHook , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , gtk2 , hamlib_4 }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-OgIgHW9NMW/xSSti3naIR8AQWUtNSv5bYdOcObStBlM="; }; - nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook3 ]; buildInputs = [ hamlib_4 gtk2 ]; meta = with lib; { diff --git a/pkgs/applications/radio/tqsl/default.nix b/pkgs/applications/radio/tqsl/default.nix index 321536f71ab52..bf6ee947785e9 100644 --- a/pkgs/applications/radio/tqsl/default.nix +++ b/pkgs/applications/radio/tqsl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, cmake, expat, openssl, zlib, lmdb, curl, sqlite, wxGTK32, wrapGAppsHook }: +{ lib, stdenv, fetchurl, cmake, expat, openssl, zlib, lmdb, curl, sqlite, wxGTK32, wrapGAppsHook3 }: stdenv.mkDerivation rec { pname = "tqsl"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-T4NBCUTYHT6ugSg1gSfjQBOBndqwSwyWLr/qlDPQGKI="; }; - nativeBuildInputs = [ cmake wrapGAppsHook ]; + nativeBuildInputs = [ cmake wrapGAppsHook3 ]; buildInputs = [ expat openssl diff --git a/pkgs/applications/science/astronomy/gpredict/default.nix b/pkgs/applications/science/astronomy/gpredict/default.nix index 56c5a92460dd5..467f478da96b3 100644 --- a/pkgs/applications/science/astronomy/gpredict/default.nix +++ b/pkgs/applications/science/astronomy/gpredict/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, fetchpatch, pkg-config, intltool , gtk3, glib, curl, goocanvas2, gpsd -, hamlib, wrapGAppsHook +, hamlib, wrapGAppsHook3 }: let @@ -24,7 +24,7 @@ in stdenv.mkDerivation { }) ]; - nativeBuildInputs = [ pkg-config intltool wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config intltool wrapGAppsHook3 ]; buildInputs = [ curl glib gtk3 goocanvas2 gpsd hamlib ]; meta = with lib; { diff --git a/pkgs/applications/science/astronomy/phd2/default.nix b/pkgs/applications/science/astronomy/phd2/default.nix index 9c66df83dd4b3..b463a2845bdcc 100644 --- a/pkgs/applications/science/astronomy/phd2/default.nix +++ b/pkgs/applications/science/astronomy/phd2/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, pkg-config, cmake, gtk3, wxGTK32 -, curl, gettext, glib, indi-full, libnova, wrapGAppsHook }: +, curl, gettext, glib, indi-full, libnova, wrapGAppsHook3 }: stdenv.mkDerivation rec { pname = "phd2"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/science/astronomy/siril/default.nix b/pkgs/applications/science/astronomy/siril/default.nix index 255927d893d28..f039d056ec677 100644 --- a/pkgs/applications/science/astronomy/siril/default.nix +++ b/pkgs/applications/science/astronomy/siril/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitLab, fetchpatch, pkg-config, meson, ninja, cmake , git, criterion, gtk3, libconfig, gnuplot, opencv, json-glib , fftwFloat, cfitsio, gsl, exiv2, librtprocess, wcslib, ffmpeg -, libraw, libtiff, libpng, libjpeg, libheif, ffms, wrapGAppsHook +, libraw, libtiff, libpng, libjpeg, libheif, ffms, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - meson ninja cmake pkg-config git criterion wrapGAppsHook + meson ninja cmake pkg-config git criterion wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix index 35d6bd8aba925..687c0b3a2dda2 100644 --- a/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/pkgs/applications/science/astronomy/stellarium/default.nix @@ -4,7 +4,7 @@ , fetchpatch , cmake , perl -, wrapGAppsHook +, wrapGAppsHook3 , wrapQtAppsHook , qtbase , qtcharts @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake perl - wrapGAppsHook + wrapGAppsHook3 wrapQtAppsHook qttools ]; diff --git a/pkgs/applications/science/biology/igv/default.nix b/pkgs/applications/science/biology/igv/default.nix index ba0114c7b5633..219792326b685 100644 --- a/pkgs/applications/science/biology/igv/default.nix +++ b/pkgs/applications/science/biology/igv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip, jdk17, testers, wrapGAppsHook, igv }: +{ lib, stdenv, fetchzip, jdk17, testers, wrapGAppsHook3, igv }: stdenv.mkDerivation rec { pname = "igv"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { chmod +x $out/bin/igv chmod +x $out/bin/igvtools ''; - nativeBuildInputs = [ wrapGAppsHook ]; + nativeBuildInputs = [ wrapGAppsHook3 ]; passthru.tests.version = testers.testVersion { package = igv; diff --git a/pkgs/applications/science/biology/jbrowse/default.nix b/pkgs/applications/science/biology/jbrowse/default.nix index c4c8966aa50d5..46a8c85d3a066 100644 --- a/pkgs/applications/science/biology/jbrowse/default.nix +++ b/pkgs/applications/science/biology/jbrowse/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, appimageTools, wrapGAppsHook }: +{ lib, fetchurl, appimageTools, wrapGAppsHook3 }: let pname = "jbrowse"; diff --git a/pkgs/applications/science/chemistry/chemtool/default.nix b/pkgs/applications/science/chemistry/chemtool/default.nix index fe2d658b5a44f..82b1834671619 100644 --- a/pkgs/applications/science/chemistry/chemtool/default.nix +++ b/pkgs/applications/science/chemistry/chemtool/default.nix @@ -5,7 +5,7 @@ , libX11 , gtk2 , fig2dev -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "hhYaBGE4azNKX/sXzfCUpJGUGIRngnL0V0mBNRTdr8s="; }; - nativeBuildInputs = [ pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook3 ]; buildInputs = [ libX11 gtk2 diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix index 584f59ba8b472..3e0f3613ba903 100644 --- a/pkgs/applications/science/electronics/gtkwave/default.nix +++ b/pkgs/applications/science/electronics/gtkwave/default.nix @@ -10,7 +10,7 @@ , stdenv , tcl , tk -, wrapGAppsHook +, wrapGAppsHook3 , xz }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-6rPgnnZBEVwHhIv7MPfdDDu+K4y+RQF+leB327pqwDg="; }; - nativeBuildInputs = [ pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook3 ]; buildInputs = [ bzip2 glib gperf gtk3 judy tcl tk xz ] ++ lib.optional stdenv.isDarwin gtk-mac-integration; diff --git a/pkgs/applications/science/electronics/horizon-eda/default.nix b/pkgs/applications/science/electronics/horizon-eda/default.nix index 1fbc92f06115f..40a91937f07f5 100644 --- a/pkgs/applications/science/electronics/horizon-eda/default.nix +++ b/pkgs/applications/science/electronics/horizon-eda/default.nix @@ -4,7 +4,7 @@ , coreutils , libspnav , python3 -, wrapGAppsHook +, wrapGAppsHook3 }: let @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = base.nativeBuildInputs ++ [ boost.dev - wrapGAppsHook + wrapGAppsHook3 python3 ]; diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index 99670eee8a46b..1cec011fae33f 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -193,14 +193,14 @@ stdenv.mkDerivation rec { "${symbols}/share/kicad/template" ]; }; - # We are emulating wrapGAppsHook, along with other variables to the wrapper + # We are emulating wrapGAppsHook3, along with other variables to the wrapper 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 : ${gtk3}/share/gsettings-schemas/${gtk3.name}" "--prefix XDG_DATA_DIRS : ${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}" - # wrapGAppsHook did these two as well, no idea if it matters... + # wrapGAppsHook3 did these two as well, no idea if it matters... "--prefix XDG_DATA_DIRS : ${cups}/share" "--prefix GIO_EXTRA_MODULES : ${dconf}/lib/gio/modules" # required to open a bug report link in firefox-wayland diff --git a/pkgs/applications/science/electronics/openboardview/default.nix b/pkgs/applications/science/electronics/openboardview/default.nix index 4eaf29133a440..4aa9ab2b66f29 100644 --- a/pkgs/applications/science/electronics/openboardview/default.nix +++ b/pkgs/applications/science/electronics/openboardview/default.nix @@ -9,7 +9,7 @@ , SDL2 , fontconfig , gtk3 -, wrapGAppsHook +, wrapGAppsHook3 , darwin }: @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ cmake pkg-config python3 wrapGAppsHook ]; + nativeBuildInputs = [ cmake pkg-config python3 wrapGAppsHook3 ]; buildInputs = [ SDL2 fontconfig gtk3 ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 37a8aba7d8c7a..68b424b32fb4a 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -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, wrapGAppsHook, makeDesktopItem, copyDesktopItems +, glib, gnome, wrapGAppsHook3, makeDesktopItem, copyDesktopItems , csdp ? null , version, coq-version ? null }@args: @@ -147,7 +147,7 @@ self = stdenv.mkDerivation { nativeBuildInputs = [ pkg-config ] ++ ocamlNativeBuildInputs ++ optional buildIde copyDesktopItems - ++ optional (buildIde && coqAtLeast "8.10") wrapGAppsHook + ++ optional (buildIde && coqAtLeast "8.10") wrapGAppsHook3 ++ optional (!coqAtLeast "8.6") gnumake42; buildInputs = [ ncurses ] ++ optionals buildIde diff --git a/pkgs/applications/science/logic/eprover/default.nix b/pkgs/applications/science/logic/eprover/default.nix index d4a8b7a6b2e87..85833940157f4 100644 --- a/pkgs/applications/science/logic/eprover/default.nix +++ b/pkgs/applications/science/logic/eprover/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "eprover"; - version = "3.0.03"; + version = "3.1"; src = fetchurl { url = "https://wwwlehre.dhbw-stuttgart.de/~sschulz/WORK/E_DOWNLOAD/V_${version}/E.tgz"; - hash = "sha256-cS5zUe2N9Kd9uzbNpeBtvLbgUN0c3N3tGcYczK3KsdQ="; + hash = "sha256-+E2z7JAkiNXhZrWRXFbhI5f9NmB0Q4eixab4GlAFqYY="; }; buildInputs = [ which ]; diff --git a/pkgs/applications/science/logic/tlaplus/toolbox.nix b/pkgs/applications/science/logic/tlaplus/toolbox.nix index 288ddc06806a8..1d5cfa5c5d93c 100644 --- a/pkgs/applications/science/logic/tlaplus/toolbox.nix +++ b/pkgs/applications/science/logic/tlaplus/toolbox.nix @@ -7,7 +7,7 @@ , libXtst , glib , zlib -, wrapGAppsHook +, wrapGAppsHook3 }: let @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeShellWrapper - wrapGAppsHook + wrapGAppsHook3 ]; dontWrapGApps = true; diff --git a/pkgs/applications/science/logic/why3/default.nix b/pkgs/applications/science/logic/why3/default.nix index 74659a58f13ee..42256ae70aa69 100644 --- a/pkgs/applications/science/logic/why3/default.nix +++ b/pkgs/applications/science/logic/why3/default.nix @@ -2,7 +2,7 @@ , ocamlPackages, coqPackages, rubber, hevea, emacs , version ? "1.7.2" , ideSupport ? true -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { strictDeps = true; nativeBuildInputs = lib.optional ideSupport - wrapGAppsHook + wrapGAppsHook3 ++ (with ocamlPackages; [ ocaml findlib menhir ]) ++ [ diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index acfc38686ea42..5ceb413a24211 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, bzip2, gfortran, libX11, libXmu, libXt, libjpeg, libpng +{ lib, stdenv, fetchurl, fetchpatch, bzip2, gfortran, libX11, libXmu, libXt, libjpeg, libpng , libtiff, ncurses, pango, pcre2, perl, readline, tcl, texlive, texliveSmall, tk, xz, zlib , less, texinfo, graphviz, icu, pkg-config, bison, imake, which, jdk, blas, lapack , curl, Cocoa, Foundation, libobjc, libcxx, tzdata @@ -37,6 +37,12 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./no-usr-local-search-paths.patch + (fetchpatch { + # https://hiddenlayer.com/research/r-bitrary-code-execution/ + name = "CVE-2024-27322.patch"; + url = "https://github.com/r-devel/r-svn/commit/f7c46500f455eb4edfc3656c3fa20af61b16abb7.patch"; + hash = "sha256-CH2mMmie9E96JeGSC7UGm7/roUNhK5xv6HO53N2ixEI="; + }) ]; # Test of the examples for package 'tcltk' fails in Darwin sandbox. See: diff --git a/pkgs/applications/science/math/nasc/default.nix b/pkgs/applications/science/math/nasc/default.nix index d25f0ad344966..b544d5fc6b145 100644 --- a/pkgs/applications/science/math/nasc/default.nix +++ b/pkgs/applications/science/math/nasc/default.nix @@ -15,7 +15,7 @@ , libqalculate , intltool , gnuplot -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { pkg-config python3 vala - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix index 2a2b4617d24b4..9673d7d479d02 100644 --- a/pkgs/applications/science/math/qalculate-gtk/default.nix +++ b/pkgs/applications/science/math/qalculate-gtk/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, intltool, autoreconfHook, pkg-config, libqalculate, gtk3, curl, wrapGAppsHook, desktopToDarwinBundle }: +{ lib, stdenv, fetchFromGitHub, intltool, autoreconfHook, pkg-config, libqalculate, gtk3, curl, wrapGAppsHook3, desktopToDarwinBundle }: stdenv.mkDerivation (finalAttrs: { pname = "qalculate-gtk"; @@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: { hardeningDisable = [ "format" ]; - nativeBuildInputs = [ intltool pkg-config autoreconfHook wrapGAppsHook ] + nativeBuildInputs = [ intltool pkg-config autoreconfHook wrapGAppsHook3 ] ++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle ]; buildInputs = [ libqalculate gtk3 curl ]; enableParallelBuilding = true; diff --git a/pkgs/applications/science/math/rofi-calc/default.nix b/pkgs/applications/science/math/rofi-calc/default.nix index be126e5fa3974..14f8fe734bd68 100644 --- a/pkgs/applications/science/math/rofi-calc/default.nix +++ b/pkgs/applications/science/math/rofi-calc/default.nix @@ -7,7 +7,7 @@ , glib , cairo , gobject-introspection -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { autoreconfHook pkg-config gobject-introspection - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/applications/science/math/wxmaxima/default.nix index 4d2815d129974..0009a04af6ac7 100644 --- a/pkgs/applications/science/math/wxmaxima/default.nix +++ b/pkgs/applications/science/math/wxmaxima/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchFromGitHub -, wrapGAppsHook +, wrapGAppsHook3 , cmake , gettext , maxima @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs:{ ]; nativeBuildInputs = [ - wrapGAppsHook + wrapGAppsHook3 cmake gettext ]; diff --git a/pkgs/applications/science/medicine/xmedcon/default.nix b/pkgs/applications/science/medicine/xmedcon/default.nix index b09183f71b960..e5c5bf68d53a7 100644 --- a/pkgs/applications/science/medicine/xmedcon/default.nix +++ b/pkgs/applications/science/medicine/xmedcon/default.nix @@ -6,7 +6,7 @@ , pkg-config , libpng , zlib -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { zlib ]; - nativeBuildInputs = [ pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook3 ]; meta = with lib; { description = "An open source toolkit for medical image conversion "; diff --git a/pkgs/applications/science/physics/crystfel/default.nix b/pkgs/applications/science/physics/crystfel/default.nix index 33f2043603177..e7eb69fb4e1c1 100644 --- a/pkgs/applications/science/physics/crystfel/default.nix +++ b/pkgs/applications/science/physics/crystfel/default.nix @@ -18,7 +18,7 @@ , pandoc , eigen , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , flex , bison , doxygen @@ -193,7 +193,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-ogNHWYfbxRmB5TdK8K0JpcCnYOOyXapQGSPh8mfp+Tc="; }; nativeBuildInputs = [ meson pkg-config ninja flex bison doxygen opencl-headers makeWrapper ] - ++ lib.optionals withGui [ wrapGAppsHook ]; + ++ lib.optionals withGui [ wrapGAppsHook3 ]; buildInputs = [ hdf5 gsl diff --git a/pkgs/applications/science/physics/xnec2c/default.nix b/pkgs/applications/science/physics/xnec2c/default.nix index 60afa09ecc8cd..ffdd4b6d0b07f 100644 --- a/pkgs/applications/science/physics/xnec2c/default.nix +++ b/pkgs/applications/science/physics/xnec2c/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchurl , autoreconfHook -, wrapGAppsHook +, wrapGAppsHook3 , pkg-config , which , gtk3 @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - wrapGAppsHook + wrapGAppsHook3 pkg-config which ]; diff --git a/pkgs/applications/science/robotics/betaflight-configurator/default.nix b/pkgs/applications/science/robotics/betaflight-configurator/default.nix index 0792d3375d0a4..84f94102da136 100644 --- a/pkgs/applications/science/robotics/betaflight-configurator/default.nix +++ b/pkgs/applications/science/robotics/betaflight-configurator/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, unzip, makeDesktopItem, nwjs, wrapGAppsHook, gsettings-desktop-schemas, gtk3 }: +{lib, stdenv, fetchurl, unzip, makeDesktopItem, nwjs, wrapGAppsHook3, gsettings-desktop-schemas, gtk3 }: let pname = "betaflight-configurator"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { find -name "lib*.so" -delete ''; - nativeBuildInputs = [ wrapGAppsHook unzip ]; + nativeBuildInputs = [ wrapGAppsHook3 unzip ]; buildInputs = [ gsettings-desktop-schemas gtk3 ]; diff --git a/pkgs/applications/science/robotics/emuflight-configurator/default.nix b/pkgs/applications/science/robotics/emuflight-configurator/default.nix index 2c51355eb54f0..62592b0cc3fc9 100644 --- a/pkgs/applications/science/robotics/emuflight-configurator/default.nix +++ b/pkgs/applications/science/robotics/emuflight-configurator/default.nix @@ -1,5 +1,5 @@ {lib, stdenv, fetchurl, unzip, makeDesktopItem, copyDesktopItems, nwjs -, wrapGAppsHook, gsettings-desktop-schemas, gtk3 }: +, wrapGAppsHook3, gsettings-desktop-schemas, gtk3 }: stdenv.mkDerivation rec { pname = "emuflight-configurator"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-e4HNg5yr9V5LyT0hYP6gzw0tZm4dLidJg5MQtH3L3JI="; }; - nativeBuildInputs = [ wrapGAppsHook unzip copyDesktopItems ]; + nativeBuildInputs = [ wrapGAppsHook3 unzip copyDesktopItems ]; buildInputs = [ gsettings-desktop-schemas gtk3 ]; diff --git a/pkgs/applications/science/robotics/inav-configurator/default.nix b/pkgs/applications/science/robotics/inav-configurator/default.nix index f5216eaf6c921..1a6f5951ed348 100644 --- a/pkgs/applications/science/robotics/inav-configurator/default.nix +++ b/pkgs/applications/science/robotics/inav-configurator/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, makeDesktopItem, copyDesktopItems, nwjs, wrapGAppsHook, gsettings-desktop-schemas, gtk3 }: +{ lib, stdenv, fetchurl, makeDesktopItem, copyDesktopItems, nwjs, wrapGAppsHook3, gsettings-desktop-schemas, gtk3 }: stdenv.mkDerivation rec { pname = "inav-configurator"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "1i844dzzc5s5cr4vfpi6k2kdn8jiqq2n6c0fjqvsp4wdidwjahzw"; }; - nativeBuildInputs = [ copyDesktopItems wrapGAppsHook ]; + nativeBuildInputs = [ copyDesktopItems wrapGAppsHook3 ]; buildInputs = [ gsettings-desktop-schemas gtk3 ]; diff --git a/pkgs/applications/system/monitor/default.nix b/pkgs/applications/system/monitor/default.nix index 2ad01f2aa26f1..fdf353646717e 100644 --- a/pkgs/applications/system/monitor/default.nix +++ b/pkgs/applications/system/monitor/default.nix @@ -20,7 +20,7 @@ , libhandy , sassc , udisks2 -, wrapGAppsHook +, wrapGAppsHook3 , libX11 , libXext , libXNVCtrl @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { vala pkg-config python3 - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/system/thumbdrives/default.nix b/pkgs/applications/system/thumbdrives/default.nix index d70ea95806293..89711e996831f 100644 --- a/pkgs/applications/system/thumbdrives/default.nix +++ b/pkgs/applications/system/thumbdrives/default.nix @@ -10,7 +10,7 @@ , gettext , glib , desktop-file-utils -, wrapGAppsHook +, wrapGAppsHook3 }: python3.pkgs.buildPythonApplication rec { @@ -38,7 +38,7 @@ python3.pkgs.buildPythonApplication rec { glib gtk3 desktop-file-utils - wrapGAppsHook + wrapGAppsHook3 gobject-introspection ]; diff --git a/pkgs/applications/terminal-emulators/gnome-console/default.nix b/pkgs/applications/terminal-emulators/gnome-console/default.nix index 2141effcf015f..5884f65c61edc 100644 --- a/pkgs/applications/terminal-emulators/gnome-console/default.nix +++ b/pkgs/applications/terminal-emulators/gnome-console/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "gnome-console"; - version = "45.0"; + version = "46.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-console/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "50YhKNLfIySh10gGLEBCnNBQSvCeQHBnsz86nQxZyOE="; + hash = "sha256-FhnOcBdzssDJA3GPVHaMGS6lB0UU1VoXdKkslyMdbD4="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/terminal-emulators/guake/default.nix b/pkgs/applications/terminal-emulators/guake/default.nix index 667da3ec229fd..9342e1833ac26 100644 --- a/pkgs/applications/terminal-emulators/guake/default.nix +++ b/pkgs/applications/terminal-emulators/guake/default.nix @@ -3,7 +3,7 @@ , python3 , glibcLocales , gobject-introspection -, wrapGAppsHook +, wrapGAppsHook3 , gtk3 , keybinder3 , libnotify @@ -28,7 +28,7 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = [ gobject-introspection - wrapGAppsHook + wrapGAppsHook3 python3.pkgs.pip ]; diff --git a/pkgs/applications/terminal-emulators/lxterminal/default.nix b/pkgs/applications/terminal-emulators/lxterminal/default.nix index 90483efc89a51..76f375e43f62e 100644 --- a/pkgs/applications/terminal-emulators/lxterminal/default.nix +++ b/pkgs/applications/terminal-emulators/lxterminal/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, automake, autoconf, intltool, pkg-config, gtk3, vte, wrapGAppsHook +{ lib, stdenv, fetchFromGitHub, automake, autoconf, intltool, pkg-config, gtk3, vte, wrapGAppsHook3 , libxslt, docbook_xml_dtd_412, docbook_xsl, libxml2, findXMLCatalogs, nixosTests , pcre2 }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - automake autoconf intltool pkg-config wrapGAppsHook + automake autoconf intltool pkg-config wrapGAppsHook3 libxslt docbook_xml_dtd_412 docbook_xsl libxml2 findXMLCatalogs ]; diff --git a/pkgs/applications/terminal-emulators/mlterm/default.nix b/pkgs/applications/terminal-emulators/mlterm/default.nix index f11c456d43760..28f027401bd74 100644 --- a/pkgs/applications/terminal-emulators/mlterm/default.nix +++ b/pkgs/applications/terminal-emulators/mlterm/default.nix @@ -14,7 +14,7 @@ , fcitx5-gtk , ibus , uim #IME -, wrapGAppsHook #color picker in mlconfig +, wrapGAppsHook3 #color picker in mlconfig , gdk-pixbuf , gtk3 , gtk ? gtk3 @@ -111,7 +111,7 @@ in stdenv.mkDerivation (finalAttrs: { pkg-config autoconf ] ++ lib.optionals enableTools.mlconfig [ - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ gtk diff --git a/pkgs/applications/terminal-emulators/terminator/default.nix b/pkgs/applications/terminal-emulators/terminator/default.nix index 4dee206be28df..3eb374af71abb 100644 --- a/pkgs/applications/terminal-emulators/terminator/default.nix +++ b/pkgs/applications/terminal-emulators/terminator/default.nix @@ -7,7 +7,7 @@ , gtk3 , gobject-introspection , libnotify -, wrapGAppsHook +, wrapGAppsHook3 , vte , nixosTests }: @@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication rec { file intltool gobject-introspection - wrapGAppsHook + wrapGAppsHook3 python3.pkgs.pytest-runner ]; diff --git a/pkgs/applications/terminal-emulators/termite/default.nix b/pkgs/applications/terminal-emulators/termite/default.nix index ab854a2f99069..a47423390ba21 100644 --- a/pkgs/applications/terminal-emulators/termite/default.nix +++ b/pkgs/applications/terminal-emulators/termite/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, vte, gtk3, ncurses, pcre2, wrapGAppsHook, nixosTests }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, vte, gtk3, ncurses, pcre2, wrapGAppsHook3, nixosTests }: let @@ -53,7 +53,7 @@ in stdenv.mkDerivation rec { buildInputs = [ vte-ng gtk3 ncurses pcre2 ]; - nativeBuildInputs = [ wrapGAppsHook pkg-config ]; + nativeBuildInputs = [ wrapGAppsHook3 pkg-config ]; outputs = [ "out" "terminfo" ]; diff --git a/pkgs/applications/version-management/deepgit/default.nix b/pkgs/applications/version-management/deepgit/default.nix index 8a778526b4ad8..c5744d073ce00 100644 --- a/pkgs/applications/version-management/deepgit/default.nix +++ b/pkgs/applications/version-management/deepgit/default.nix @@ -7,7 +7,7 @@ , lib , makeDesktopItem , stdenv -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ copyDesktopItems - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index a3160f1ce3a53..7a660dedad81f 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -2,7 +2,7 @@ , libXfixes, atk, gtk3, libXrender, pango, gnome, cairo, freetype, fontconfig , libX11, libXi, libxcb, libXext, libXcursor, glib, libXScrnSaver, libxkbfile, libXtst , nss, nspr, cups, fetchzip, expat, gdk-pixbuf, libXdamage, libXrandr, dbus -, makeDesktopItem, openssl, wrapGAppsHook, makeShellWrapper, at-spi2-atk, at-spi2-core, libuuid +, makeDesktopItem, openssl, wrapGAppsHook3, makeShellWrapper, at-spi2-atk, at-spi2-core, libuuid , e2fsprogs, krb5, libdrm, mesa, unzip, copyDesktopItems, libxshmfence, libxkbcommon, git , libGL, zlib, cacert }: @@ -106,7 +106,7 @@ let comment = "Graphical Git client from Axosoft"; }) ]; - nativeBuildInputs = [ copyDesktopItems (wrapGAppsHook.override { makeWrapper = makeShellWrapper; }) ]; + nativeBuildInputs = [ copyDesktopItems (wrapGAppsHook3.override { makeWrapper = makeShellWrapper; }) ]; buildInputs = [ gtk3 gnome.adwaita-icon-theme ]; # avoid double-wrapping diff --git a/pkgs/applications/version-management/gitlab/gitlab-container-registry/Disable-inmemory-storage-driver-test.patch b/pkgs/applications/version-management/gitlab/gitlab-container-registry/Disable-inmemory-storage-driver-test.patch deleted file mode 100644 index 16f47fb3ae18d..0000000000000 --- a/pkgs/applications/version-management/gitlab/gitlab-container-registry/Disable-inmemory-storage-driver-test.patch +++ /dev/null @@ -1,38 +0,0 @@ -From bc359e8f51a17ba759121339e87e90eed16e98fe Mon Sep 17 00:00:00 2001 -From: Yaya <mak@nyantec.com> -Date: Tue, 20 Jun 2023 10:01:23 +0000 -Subject: [PATCH] Disable inmemory storage driver test - ---- - .../storage/driver/inmemory/driver_test.go | 19 ------------------- - 1 file changed, 19 deletions(-) - delete mode 100644 registry/storage/driver/inmemory/driver_test.go - -diff --git a/registry/storage/driver/inmemory/driver_test.go b/registry/storage/driver/inmemory/driver_test.go -deleted file mode 100644 -index dbc1916f..00000000 ---- a/registry/storage/driver/inmemory/driver_test.go -+++ /dev/null -@@ -1,19 +0,0 @@ --package inmemory -- --import ( -- "testing" -- -- storagedriver "github.com/docker/distribution/registry/storage/driver" -- "github.com/docker/distribution/registry/storage/driver/testsuites" -- "gopkg.in/check.v1" --) -- --// Hook up gocheck into the "go test" runner. --func Test(t *testing.T) { check.TestingT(t) } -- --func init() { -- inmemoryDriverConstructor := func() (storagedriver.StorageDriver, error) { -- return New(), nil -- } -- testsuites.RegisterSuite(inmemoryDriverConstructor, testsuites.NeverSkip) --} --- -2.40.1 - diff --git a/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix b/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix index c92cc3e0ddeb0..2fd7ab95ed685 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix @@ -15,11 +15,10 @@ buildGoModule rec { vendorHash = "sha256-KZWdM8Q8ipsgm7OoLyOuHo+4Vg2Nve+yZtTSUDgjOW4="; - patches = [ - ./Disable-inmemory-storage-driver-test.patch - ]; - postPatch = '' + # Disable flaky inmemory storage driver test + rm registry/storage/driver/inmemory/driver_test.go + substituteInPlace health/checks/checks_test.go \ --replace \ 'func TestHTTPChecker(t *testing.T) {' \ diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix index 3b2f52f007741..f5e66083553cb 100644 --- a/pkgs/applications/version-management/meld/default.nix +++ b/pkgs/applications/version-management/meld/default.nix @@ -5,7 +5,7 @@ , python3 , meson , ninja -, wrapGAppsHook +, wrapGAppsHook3 , libxml2 , pkg-config , desktop-file-utils @@ -36,7 +36,7 @@ python3.pkgs.buildPythonApplication rec { pkg-config desktop-file-utils gobject-introspection - wrapGAppsHook + wrapGAppsHook3 gtk3 # for gtk-update-icon-cache ]; diff --git a/pkgs/applications/version-management/sublime-merge/common.nix b/pkgs/applications/version-management/sublime-merge/common.nix index 39157edf809ba..811bed7694c1e 100644 --- a/pkgs/applications/version-management/sublime-merge/common.nix +++ b/pkgs/applications/version-management/sublime-merge/common.nix @@ -18,7 +18,7 @@ pango, libredirect, makeWrapper, - wrapGAppsHook, + wrapGAppsHook3, pkexecPath ? "/run/wrappers/bin/pkexec", writeShellScript, common-updater-scripts, @@ -77,7 +77,7 @@ let ]; nativeBuildInputs = [ makeWrapper - wrapGAppsHook + wrapGAppsHook3 ]; buildPhase = '' diff --git a/pkgs/applications/video/bombono/default.nix b/pkgs/applications/video/bombono/default.nix index 8ad77a6680191..87545d5bceecb 100644 --- a/pkgs/applications/video/bombono/default.nix +++ b/pkgs/applications/video/bombono/default.nix @@ -15,7 +15,7 @@ , libdvdread , libxmlxx , mjpegtools -, wrapGAppsHook +, wrapGAppsHook3 }: let @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { --replace "lib_mbase_env['CPPDEFINES']" "list(lib_mbase_env['CPPDEFINES'])" ''; - nativeBuildInputs = [ wrapGAppsHook scons pkg-config gettext ]; + nativeBuildInputs = [ wrapGAppsHook3 scons pkg-config gettext ]; buildInputs = [ boost diff --git a/pkgs/applications/video/byzanz/default.nix b/pkgs/applications/video/byzanz/default.nix index e3a97197d1049..bc88c24814678 100644 --- a/pkgs/applications/video/byzanz/default.nix +++ b/pkgs/applications/video/byzanz/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchgit -, wrapGAppsHook +, wrapGAppsHook3 , cairo , glib , gnome @@ -51,7 +51,7 @@ stdenv.mkDerivation { gst-plugins-good gst-plugins-ugly gst-libav - wrapGAppsHook + wrapGAppsHook3 ]); meta = with lib; { diff --git a/pkgs/applications/video/devede/default.nix b/pkgs/applications/video/devede/default.nix index 22689e27d6e9a..f17638d42e3b7 100644 --- a/pkgs/applications/video/devede/default.nix +++ b/pkgs/applications/video/devede/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitLab, python3Packages, ffmpeg, mplayer, vcdimager, cdrkit, dvdauthor -, gtk3, gettext, wrapGAppsHook, gdk-pixbuf, gobject-introspection }: +, gtk3, gettext, wrapGAppsHook3, gdk-pixbuf, gobject-introspection }: let inherit (python3Packages) dbus-python buildPythonApplication pygobject3 urllib3 setuptools; @@ -16,7 +16,7 @@ in buildPythonApplication rec { }; nativeBuildInputs = [ - gettext wrapGAppsHook + gettext wrapGAppsHook3 gobject-introspection ]; diff --git a/pkgs/applications/video/dvdstyler/default.nix b/pkgs/applications/video/dvdstyler/default.nix index 18018f88d0256..e25bdf877a844 100644 --- a/pkgs/applications/video/dvdstyler/default.nix +++ b/pkgs/applications/video/dvdstyler/default.nix @@ -16,7 +16,7 @@ , libexif , libjpeg , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , wxGTK32 , wxSVG , xine-ui @@ -53,7 +53,7 @@ in stdenv.mkDerivation rec { gettext gobject-introspection pkg-config - wrapGAppsHook + wrapGAppsHook3 xmlto zip ]; diff --git a/pkgs/applications/video/entangle/default.nix b/pkgs/applications/video/entangle/default.nix index cfab93dbcd71a..c06513a0fc0c4 100644 --- a/pkgs/applications/video/entangle/default.nix +++ b/pkgs/applications/video/entangle/default.nix @@ -9,7 +9,7 @@ , perl , python3 , pkgconf -, wrapGAppsHook +, wrapGAppsHook3 , at-spi2-core , dbus , elfutils @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { perl # for pod2man and build scripts python3 # for build scripts pkgconf - wrapGAppsHook + wrapGAppsHook3 gobject-introspection ]; diff --git a/pkgs/applications/video/flowblade/default.nix b/pkgs/applications/video/flowblade/default.nix index 937f5865d4043..fff387881ccad 100644 --- a/pkgs/applications/video/flowblade/default.nix +++ b/pkgs/applications/video/flowblade/default.nix @@ -1,6 +1,6 @@ { lib, fetchFromGitHub, stdenv , ffmpeg, frei0r, sox, gtk3, python3, ladspaPlugins -, gobject-introspection, makeWrapper, wrapGAppsHook +, gobject-introspection, makeWrapper, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { (python3.withPackages (ps: with ps; [ mlt pygobject3 dbus-python numpy pillow libusb1 ])) ]; - nativeBuildInputs = [ gobject-introspection makeWrapper wrapGAppsHook ]; + nativeBuildInputs = [ gobject-introspection makeWrapper wrapGAppsHook3 ]; installPhase = '' runHook preInstall diff --git a/pkgs/applications/video/gnome-mplayer/default.nix b/pkgs/applications/video/gnome-mplayer/default.nix index 09ed7efaf0c0b..436f31ac5a01d 100644 --- a/pkgs/applications/video/gnome-mplayer/default.nix +++ b/pkgs/applications/video/gnome-mplayer/default.nix @@ -1,5 +1,5 @@ {lib, stdenv, substituteAll, fetchFromGitHub, pkg-config, gettext, glib, gtk3, gmtk, dbus, dbus-glib -, libnotify, libpulseaudio, mplayer, wrapGAppsHook }: +, libnotify, libpulseaudio, mplayer, wrapGAppsHook3 }: stdenv.mkDerivation rec { pname = "gnome-mplayer"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0qvy9fllvg1mad6y1j79iaqa6khs0q2cb0z62yfg4srbr07fi8xr"; }; - nativeBuildInputs = [ pkg-config gettext wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config gettext wrapGAppsHook3 ]; buildInputs = [ glib gtk3 gmtk dbus dbus-glib libnotify libpulseaudio ]; patches = [ diff --git a/pkgs/applications/video/gnomecast/default.nix b/pkgs/applications/video/gnomecast/default.nix index 9d0bfa9e966e3..cb6e4a80510a3 100644 --- a/pkgs/applications/video/gnomecast/default.nix +++ b/pkgs/applications/video/gnomecast/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, python3Packages, fetchFromGitHub, gtk3, gobject-introspection, ffmpeg, wrapGAppsHook }: +{ stdenv, lib, python3Packages, fetchFromGitHub, gtk3, gobject-introspection, ffmpeg, wrapGAppsHook3 }: with python3Packages; buildPythonApplication rec { @@ -12,7 +12,7 @@ buildPythonApplication rec { sha256 = "sha256-CJpbBuRzEjWb8hsh3HMW4bZA7nyDAwjrERCS5uGdwn8="; }; - nativeBuildInputs = [ wrapGAppsHook ]; + nativeBuildInputs = [ wrapGAppsHook3 ]; propagatedBuildInputs = [ pychromecast bottle diff --git a/pkgs/applications/video/gpu-screen-recorder/gpu-screen-recorder-gtk.nix b/pkgs/applications/video/gpu-screen-recorder/gpu-screen-recorder-gtk.nix index 86bfebad3860b..678881faec444 100644 --- a/pkgs/applications/video/gpu-screen-recorder/gpu-screen-recorder-gtk.nix +++ b/pkgs/applications/video/gpu-screen-recorder/gpu-screen-recorder-gtk.nix @@ -8,7 +8,7 @@ , libdrm , gpu-screen-recorder , libglvnd -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation { @@ -24,7 +24,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkg-config makeWrapper - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix index da7170ca5f381..f3f6dacd4a540 100644 --- a/pkgs/applications/video/handbrake/default.nix +++ b/pkgs/applications/video/handbrake/default.nix @@ -73,7 +73,7 @@ , desktop-file-utils , meson , ninja -, wrapGAppsHook +, wrapGAppsHook3 , intltool , glib , gtk3 @@ -220,7 +220,7 @@ let pkg-config python3 ] - ++ optionals useGtk [ desktop-file-utils intltool meson ninja wrapGAppsHook ]; + ++ optionals useGtk [ desktop-file-utils intltool meson ninja wrapGAppsHook3 ]; buildInputs = [ a52dec diff --git a/pkgs/applications/video/hypnotix/default.nix b/pkgs/applications/video/hypnotix/default.nix index 5c2e4812501c8..a3b1e25de48c0 100644 --- a/pkgs/applications/video/hypnotix/default.nix +++ b/pkgs/applications/video/hypnotix/default.nix @@ -8,7 +8,7 @@ , gobject-introspection , mpv , python3 -, wrapGAppsHook +, wrapGAppsHook3 , yt-dlp }: @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { gettext gobject-introspection python3.pkgs.wrapPython - wrapGAppsHook + wrapGAppsHook3 ]; dontWrapGApps = true; diff --git a/pkgs/applications/video/imagination/default.nix b/pkgs/applications/video/imagination/default.nix index 8d1d6ac305f9e..6dd9793b8b977 100644 --- a/pkgs/applications/video/imagination/default.nix +++ b/pkgs/applications/video/imagination/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, autoreconfHook, docbook_xsl, ffmpeg-full, glib, gtk3 -, intltool, libxslt, pkg-config, sox, wrapGAppsHook }: +, intltool, libxslt, pkg-config, sox, wrapGAppsHook3 }: stdenv.mkDerivation rec { pname = "imagination"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { intltool libxslt pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ ffmpeg-full glib gtk3 sox ]; diff --git a/pkgs/applications/video/jellyfin-mpv-shim/default.nix b/pkgs/applications/video/jellyfin-mpv-shim/default.nix index dad9a52402495..70f28ab72077c 100644 --- a/pkgs/applications/video/jellyfin-mpv-shim/default.nix +++ b/pkgs/applications/video/jellyfin-mpv-shim/default.nix @@ -13,7 +13,7 @@ , python-mpv-jsonipc , pywebview , tkinter -, wrapGAppsHook +, wrapGAppsHook3 }: buildPythonApplication rec { @@ -27,7 +27,7 @@ buildPythonApplication rec { nativeBuildInputs = [ copyDesktopItems - wrapGAppsHook + wrapGAppsHook3 gobject-introspection ]; diff --git a/pkgs/applications/video/kazam/default.nix b/pkgs/applications/video/kazam/default.nix index 8ca3b813663f4..cf392a143d7dc 100644 --- a/pkgs/applications/video/kazam/default.nix +++ b/pkgs/applications/video/kazam/default.nix @@ -3,7 +3,7 @@ , substituteAll , python3Packages , gst_all_1 -, wrapGAppsHook +, wrapGAppsHook3 , gobject-introspection , gtk3 , libwnck @@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec { sha256 = "1jk6khwgdv3nmagdgp5ivz3156pl0ljhf7b6i4b52w1h5ywsg9ah"; }; - nativeBuildInputs = [ gobject-introspection python3Packages.distutils-extra intltool wrapGAppsHook ]; + nativeBuildInputs = [ gobject-introspection python3Packages.distutils-extra intltool wrapGAppsHook3 ]; buildInputs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base diff --git a/pkgs/applications/video/mpv/scripts/convert.nix b/pkgs/applications/video/mpv/scripts/convert.nix index d1fdc9c801bb7..2505be15da544 100644 --- a/pkgs/applications/video/mpv/scripts/convert.nix +++ b/pkgs/applications/video/mpv/scripts/convert.nix @@ -22,14 +22,14 @@ buildLua { postPatch = '' substituteInPlace convert_script.lua \ - --replace 'mkvpropedit_exe = "mkvpropedit"' \ - 'mkvpropedit_exe = "${mkvtoolnix-cli}/bin/mkvpropedit"' \ - --replace 'mkvmerge_exe = "mkvmerge"' \ - 'mkvmerge_exe = "${mkvtoolnix-cli}/bin/mkvmerge"' \ - --replace 'yad_exe = "yad"' \ - 'yad_exe = "${yad}/bin/yad"' \ - --replace 'notify_send_exe = "notify-send"' \ - 'notify_send_exe = "${libnotify}/bin/notify-send"' \ + --replace-fail 'mkvpropedit_exe = "mkvpropedit"' \ + 'mkvpropedit_exe = "${lib.getExe' mkvtoolnix-cli "mkvpropedit"}"' \ + --replace-fail 'mkvmerge_exe = "mkvmerge"' \ + 'mkvmerge_exe = "${lib.getExe' mkvtoolnix-cli "mkvmerge"}"' \ + --replace-fail 'yad_exe = "yad"' \ + 'yad_exe = "${lib.getExe yad}"' \ + --replace-fail 'notify_send_exe = "notify-send"' \ + 'notify_send_exe = "${lib.getExe libnotify}"' \ ''; scriptPath = "convert_script.lua"; diff --git a/pkgs/applications/video/mpv/scripts/cutter.nix b/pkgs/applications/video/mpv/scripts/cutter.nix index ac2f518a9b5ab..c58d0a81da633 100644 --- a/pkgs/applications/video/mpv/scripts/cutter.nix +++ b/pkgs/applications/video/mpv/scripts/cutter.nix @@ -16,13 +16,13 @@ buildLua { postPatch = '' substituteInPlace cutter.lua \ - --replace '~/.config/mpv/scripts/c_concat.sh' '${placeholder "out"}/share/mpv/scripts/c_concat.sh' + --replace-fail '~/.config/mpv/scripts/c_concat.sh' '${placeholder "out"}/share/mpv/scripts/c_concat.sh' # needs to be ran separately so that we can replace everything, and not every single mention explicitly # original script places them in the scripts folder, just spawning unnecessary errors # i know that hardcoding .config and especially the .mpv directory isn't best practice, but I didn't want to deviate too much from upstream substituteInPlace cutter.lua \ - --replace '~/.config/mpv/scripts' "''${XDG_CONFIG_HOME:-~/.config}/mpv/cutter" + --replace-fail '~/.config/mpv/scripts' "''${XDG_CONFIG_HOME:-~/.config}/mpv/cutter" ''; passthru.scriptName = "cutter.lua"; diff --git a/pkgs/applications/video/mpv/scripts/mpris.nix b/pkgs/applications/video/mpv/scripts/mpris.nix index 338f0a8dd482f..7caaf24a8c9dc 100644 --- a/pkgs/applications/video/mpv/scripts/mpris.nix +++ b/pkgs/applications/video/mpv/scripts/mpris.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib mpv-unwrapped ffmpeg ]; postPatch = '' - substituteInPlace Makefile --replace 'PKG_CONFIG =' 'PKG_CONFIG ?=' + substituteInPlace Makefile --replace-fail 'PKG_CONFIG =' 'PKG_CONFIG ?=' ''; installFlags = [ "SCRIPTS_DIR=${placeholder "out"}/share/mpv/scripts" ]; diff --git a/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix b/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix index 44f09b8f21fe8..ffc1e81eed5d0 100644 --- a/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix +++ b/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix @@ -14,8 +14,8 @@ buildLua rec { postPatch = '' substituteInPlace playlistmanager.lua \ - --replace 'youtube_dl_executable = "youtube-dl",' \ - 'youtube_dl_executable = "${lib.getBin yt-dlp}/bin/yt-dlp"', + --replace-fail 'youtube_dl_executable = "yt-dlp",' \ + 'youtube_dl_executable = "${lib.getExe yt-dlp}"', ''; meta = with lib; { diff --git a/pkgs/applications/video/mpv/scripts/mpvacious.nix b/pkgs/applications/video/mpv/scripts/mpvacious.nix index adac4d1d60692..abbe2ba747dbb 100644 --- a/pkgs/applications/video/mpv/scripts/mpvacious.nix +++ b/pkgs/applications/video/mpv/scripts/mpvacious.nix @@ -23,11 +23,11 @@ buildLua rec { postPatch = '' substituteInPlace utils/forvo.lua \ - --replace "'curl" "'${curl}/bin/curl" + --replace-fail "'curl" "'${lib.getExe curl}" substituteInPlace platform/nix.lua \ - --replace "'curl" "'${curl}/bin/curl" \ - --replace "'wl-copy" "'${wl-clipboard}/bin/wl-copy" \ - --replace "'xclip" "'${xclip}/bin/xclip" + --replace-fail "'curl" "'${lib.getExe curl}" \ + --replace-fail "'wl-copy" "'${lib.getExe' wl-clipboard "wl-copy"}" \ + --replace-fail "'xclip" "'${lib.getExe xclip}" ''; installPhase = '' diff --git a/pkgs/applications/video/mpv/scripts/sponsorblock.nix b/pkgs/applications/video/mpv/scripts/sponsorblock.nix index 56ac2575ecdea..6caa10045c484 100644 --- a/pkgs/applications/video/mpv/scripts/sponsorblock.nix +++ b/pkgs/applications/video/mpv/scripts/sponsorblock.nix @@ -28,8 +28,8 @@ buildLua { postPatch = '' substituteInPlace sponsorblock.lua \ - --replace "python3" "${python3}/bin/python3" \ - --replace 'mp.find_config_file("scripts")' "\"$out/share/mpv/scripts\"" + --replace-fail "python3" "${lib.getExe python3}" \ + --replace-fail 'mp.find_config_file("scripts")' "\"$out/share/mpv/scripts\"" ''; extraScripts = [ "sponsorblock_shared" ]; diff --git a/pkgs/applications/video/mpv/scripts/thumbfast.nix b/pkgs/applications/video/mpv/scripts/thumbfast.nix index e30c62774b759..f5595f637b080 100644 --- a/pkgs/applications/video/mpv/scripts/thumbfast.nix +++ b/pkgs/applications/video/mpv/scripts/thumbfast.nix @@ -13,7 +13,7 @@ buildLua { passthru.updateScript = unstableGitUpdater {}; passthru.extraWrapperArgs = [ - "--prefix" "PATH" ":" "${lib.getBin mpv-unwrapped}/bin" + "--prefix" "PATH" ":" (lib.makeBinPath [ mpv-unwrapped ]) ]; meta = { diff --git a/pkgs/applications/video/mpv/scripts/vr-reversal.nix b/pkgs/applications/video/mpv/scripts/vr-reversal.nix index 9a7b335a6591d..f68e4566f9210 100644 --- a/pkgs/applications/video/mpv/scripts/vr-reversal.nix +++ b/pkgs/applications/video/mpv/scripts/vr-reversal.nix @@ -18,7 +18,7 @@ stdenvNoCC.mkDerivation rec { # reset_rot is only available in ffmpeg 5.0, see 5bcc61ce87922ecccaaa0bd303a7e195929859a8 postPatch = lib.optionalString (lib.versionOlder ffmpeg.version "5.0") '' - substituteInPlace 360plugin.lua --replace ":reset_rot=1:" ":" + substituteInPlace 360plugin.lua --replace-fail ":reset_rot=1:" ":" ''; installPhase = '' diff --git a/pkgs/applications/video/mpv/scripts/webtorrent-mpv-hook.nix b/pkgs/applications/video/mpv/scripts/webtorrent-mpv-hook.nix index 10fe3d0cdce03..08967c3f28451 100644 --- a/pkgs/applications/video/mpv/scripts/webtorrent-mpv-hook.nix +++ b/pkgs/applications/video/mpv/scripts/webtorrent-mpv-hook.nix @@ -15,9 +15,9 @@ buildNpmPackage rec { }; postPatch = '' - substituteInPlace src/webtorrent.ts --replace "node_path: 'node'" "node_path: '${nodejs}/bin/node'" + substituteInPlace src/webtorrent.ts --replace-fail "node_path: 'node'" "node_path: '${lib.getExe nodejs}'" # This executable is just for telling non-Nix users how to install - substituteInPlace package.json --replace '"bin": "build/bin.mjs",' "" + substituteInPlace package.json --replace-fail '"bin": "build/bin.mjs",' "" rm -rf src/bin.ts ''; diff --git a/pkgs/applications/video/mpv/scripts/youtube-upnext.nix b/pkgs/applications/video/mpv/scripts/youtube-upnext.nix index cdd7ea66a1763..ec5da9161a036 100644 --- a/pkgs/applications/video/mpv/scripts/youtube-upnext.nix +++ b/pkgs/applications/video/mpv/scripts/youtube-upnext.nix @@ -13,7 +13,7 @@ buildLua rec { postPatch = '' substituteInPlace youtube-upnext.lua \ - --replace '"curl"' '"${lib.getExe curl}"' + --replace-fail '"curl"' '"${lib.getExe curl}"' ''; passthru.updateScript = unstableGitUpdater { }; diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index f278d832958ed..418d9adf8263b 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -24,7 +24,7 @@ , libvlc , libGL , mbedtls -, wrapGAppsHook +, wrapGAppsHook3 , scriptingSupport ? true , luajit , swig4 @@ -90,7 +90,7 @@ stdenv.mkDerivation (finalAttrs: { addOpenGLRunpath cmake pkg-config - wrapGAppsHook + wrapGAppsHook3 wrapQtAppsHook ] ++ optional scriptingSupport swig4; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-webkitgtk.nix b/pkgs/applications/video/obs-studio/plugins/obs-webkitgtk.nix index fcf426bde635d..41b33b528a9fc 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-webkitgtk.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-webkitgtk.nix @@ -8,7 +8,7 @@ , cmake , pkg-config , ninja -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { cmake pkg-config ninja - wrapGAppsHook + wrapGAppsHook3 ]; postPatch = '' diff --git a/pkgs/applications/video/openshot-qt/default.nix b/pkgs/applications/video/openshot-qt/default.nix index fdd96d1aa3ded..4a8208d8bbb6e 100644 --- a/pkgs/applications/video/openshot-qt/default.nix +++ b/pkgs/applications/video/openshot-qt/default.nix @@ -11,7 +11,7 @@ , qtwayland , wayland , waylandSupport ? stdenv.isLinux -, wrapGAppsHook +, wrapGAppsHook3 }: let @@ -31,7 +31,7 @@ mkDerivationWith python3.pkgs.buildPythonApplication { nativeBuildInputs = [ doxygen - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/video/peek/default.nix b/pkgs/applications/video/peek/default.nix index 105a86fbf4a7b..a2817d10edcaa 100644 --- a/pkgs/applications/video/peek/default.nix +++ b/pkgs/applications/video/peek/default.nix @@ -11,7 +11,7 @@ , pkg-config , txt2man , vala -, wrapGAppsHook +, wrapGAppsHook3 , gsettings-desktop-schemas , gtk3 , glib @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { txt2man python3 vala - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/video/pipe-viewer/default.nix b/pkgs/applications/video/pipe-viewer/default.nix index 5d3256931f12e..3f7f89a7b30cd 100644 --- a/pkgs/applications/video/pipe-viewer/default.nix +++ b/pkgs/applications/video/pipe-viewer/default.nix @@ -3,7 +3,7 @@ , perl , buildPerlModule , makeWrapper -, wrapGAppsHook +, wrapGAppsHook3 , withGtk3 ? false , ffmpeg , mpv @@ -48,10 +48,10 @@ buildPerlModule rec { }; nativeBuildInputs = [ makeWrapper ] - ++ lib.optionals withGtk3 [ wrapGAppsHook ]; + ++ lib.optionals withGtk3 [ wrapGAppsHook3 ]; buildInputs = [ perlEnv ] - # Can't be in perlEnv for wrapGAppsHook to work correctly + # Can't be in perlEnv for wrapGAppsHook3 to work correctly ++ lib.optional withGtk3 Gtk3; # Not supported by buildPerlModule diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix index eb00353b83d1e..85ee9c0e7ef8d 100644 --- a/pkgs/applications/video/pitivi/default.nix +++ b/pkgs/applications/video/pitivi/default.nix @@ -4,7 +4,7 @@ , gettext , itstool , python3 -, wrapGAppsHook +, wrapGAppsHook3 , gst_all_1 , gtk3 , gobject-introspection @@ -44,7 +44,7 @@ python3.pkgs.buildPythonApplication rec { gettext itstool python3 - wrapGAppsHook + wrapGAppsHook3 gobject-introspection ]; diff --git a/pkgs/applications/video/plex-mpv-shim/default.nix b/pkgs/applications/video/plex-mpv-shim/default.nix index 2e71c4668356e..7d862fb216d7b 100644 --- a/pkgs/applications/video/plex-mpv-shim/default.nix +++ b/pkgs/applications/video/plex-mpv-shim/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonApplication, fetchFromGitHub, fetchpatch, python, mpv, requests, python-mpv-jsonipc, pystray, tkinter -, wrapGAppsHook, gobject-introspection, mpv-shim-default-shaders }: +, wrapGAppsHook3, gobject-introspection, mpv-shim-default-shaders }: buildPythonApplication rec { pname = "plex-mpv-shim"; @@ -21,7 +21,7 @@ buildPythonApplication rec { ]; nativeBuildInputs = [ - wrapGAppsHook + wrapGAppsHook3 gobject-introspection ]; diff --git a/pkgs/applications/video/recapp/default.nix b/pkgs/applications/video/recapp/default.nix index c15a0680a9333..b6cb8c6377bba 100644 --- a/pkgs/applications/video/recapp/default.nix +++ b/pkgs/applications/video/recapp/default.nix @@ -14,7 +14,7 @@ , ninja , pkg-config , slop -, wrapGAppsHook +, wrapGAppsHook3 }: python3.pkgs.buildPythonApplication rec { @@ -43,7 +43,7 @@ python3.pkgs.buildPythonApplication rec { meson ninja pkg-config - wrapGAppsHook + wrapGAppsHook3 gobject-introspection ]; diff --git a/pkgs/applications/video/rtabmap/default.nix b/pkgs/applications/video/rtabmap/default.nix index 1147d1ef1d949..b44389045187c 100644 --- a/pkgs/applications/video/rtabmap/default.nix +++ b/pkgs/applications/video/rtabmap/default.nix @@ -20,7 +20,7 @@ , libGL , libGLU , vtkWithQt5 -, wrapGAppsHook +, wrapGAppsHook3 , liblapack , xorg }: @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { hash = "sha256-HrIATYRuhFfTlO4oTRZo7CM30LFVyatZJON31Fe4HTQ="; }; - nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook wrapGAppsHook ]; + nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook wrapGAppsHook3 ]; buildInputs = [ ## Required opencv diff --git a/pkgs/applications/video/screenkey/default.nix b/pkgs/applications/video/screenkey/default.nix index 90cf5e7dcf247..301fc3e30f82c 100644 --- a/pkgs/applications/video/screenkey/default.nix +++ b/pkgs/applications/video/screenkey/default.nix @@ -1,6 +1,6 @@ { lib , fetchFromGitLab -, wrapGAppsHook +, wrapGAppsHook3 , xorg , gobject-introspection , gtk3 @@ -21,7 +21,7 @@ python3.pkgs.buildPythonApplication rec { }; nativeBuildInputs = [ - wrapGAppsHook + wrapGAppsHook3 # for setup hook gobject-introspection ]; @@ -38,7 +38,7 @@ python3.pkgs.buildPythonApplication rec { dbus-python ]; - # Prevent double wrapping because of wrapGAppsHook + # Prevent double wrapping because of wrapGAppsHook3 dontWrapGApps = true; preFixup = '' diff --git a/pkgs/applications/video/streamlink-twitch-gui/bin.nix b/pkgs/applications/video/streamlink-twitch-gui/bin.nix index 543b2b524708f..ac1490345c29c 100644 --- a/pkgs/applications/video/streamlink-twitch-gui/bin.nix +++ b/pkgs/applications/video/streamlink-twitch-gui/bin.nix @@ -5,7 +5,7 @@ , makeDesktopItem , makeWrapper , stdenv -, wrapGAppsHook +, wrapGAppsHook3 , at-spi2-core , atk , alsa-lib @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { libXScrnSaver libXtst makeWrapper - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ streamlink ]; diff --git a/pkgs/applications/video/subtitleeditor/default.nix b/pkgs/applications/video/subtitleeditor/default.nix index fd8e03963dca0..b440c187403e5 100644 --- a/pkgs/applications/video/subtitleeditor/default.nix +++ b/pkgs/applications/video/subtitleeditor/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, intltool, file, desktop-file-utils, enchant, gtk3, gtkmm3, gst_all_1, hicolor-icon-theme, - libsigcxx, libxmlxx, xdg-utils, isocodes, wrapGAppsHook + libsigcxx, libxmlxx, xdg-utils, isocodes, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { pkg-config intltool file - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/video/tartube/default.nix b/pkgs/applications/video/tartube/default.nix index 5b62399a04651..73f6946f6baaf 100644 --- a/pkgs/applications/video/tartube/default.nix +++ b/pkgs/applications/video/tartube/default.nix @@ -6,7 +6,7 @@ , libnotify , pango , python3Packages -, wrapGAppsHook +, wrapGAppsHook3 , youtube-dl , glib , ffmpeg @@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ gobject-introspection - wrapGAppsHook + wrapGAppsHook3 ]; strictDeps = false; diff --git a/pkgs/applications/video/timelens/default.nix b/pkgs/applications/video/timelens/default.nix index bd38a4c2f76af..c5d2ff7c4c5ad 100644 --- a/pkgs/applications/video/timelens/default.nix +++ b/pkgs/applications/video/timelens/default.nix @@ -4,7 +4,7 @@ , pkg-config , glib , gst_all_1 -, wrapGAppsHook +, wrapGAppsHook3 }: rustPlatform.buildRustPackage rec { @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/video/xplayer/default.nix b/pkgs/applications/video/xplayer/default.nix index baa8fcb95be0b..929d9d2952c48 100644 --- a/pkgs/applications/video/xplayer/default.nix +++ b/pkgs/applications/video/xplayer/default.nix @@ -21,7 +21,7 @@ , libxplayer-plparser , pkg-config , python3 -, wrapGAppsHook +, wrapGAppsHook3 , xapp , yelp-tools }: @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - wrapGAppsHook + wrapGAppsHook3 autoconf-archive gettext gtk-doc diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 3b1eb3b9908cb..cf8012b2a3e08 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -13,7 +13,7 @@ , pipewireSupport ? !stdenv.isDarwin && !nixosTestRunner && !toolsOnly, pipewire , sdlSupport ? !stdenv.isDarwin && !nixosTestRunner && !toolsOnly, SDL2, SDL2_image , jackSupport ? !stdenv.isDarwin && !nixosTestRunner && !toolsOnly, libjack2 -, gtkSupport ? !stdenv.isDarwin && !xenSupport && !nixosTestRunner && !toolsOnly, gtk3, gettext, vte, wrapGAppsHook +, gtkSupport ? !stdenv.isDarwin && !xenSupport && !nixosTestRunner && !toolsOnly, gtk3, gettext, vte, wrapGAppsHook3 , vncSupport ? !nixosTestRunner && !toolsOnly, libjpeg, libpng , smartcardSupport ? !nixosTestRunner && !toolsOnly, libcacard , spiceSupport ? true && !nixosTestRunner && !toolsOnly, spice, spice-protocol @@ -72,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: { # Don't change this to python3 and python3.pkgs.*, breaks cross-compilation python3Packages.python python3Packages.sphinx python3Packages.sphinx-rtd-theme ] - ++ lib.optionals gtkSupport [ wrapGAppsHook ] + ++ lib.optionals gtkSupport [ wrapGAppsHook3 ] ++ lib.optionals hexagonSupport [ glib ] ++ lib.optionals stdenv.isDarwin [ sigtool ]; diff --git a/pkgs/applications/virtualization/quickgui/default.nix b/pkgs/applications/virtualization/quickgui/default.nix index 572ee4a0c0823..f4420c6aeac3e 100644 --- a/pkgs/applications/virtualization/quickgui/default.nix +++ b/pkgs/applications/virtualization/quickgui/default.nix @@ -3,7 +3,7 @@ , fetchurl , autoPatchelfHook , dpkg -, wrapGAppsHook +, wrapGAppsHook3 , quickemu , gnome }: @@ -20,7 +20,7 @@ stdenvNoCC.mkDerivation rec { nativeBuildInputs = [ autoPatchelfHook dpkg - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index 813e77db435cf..3cbc285076fee 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, python3, intltool, file, wrapGAppsHook, gtk-vnc +{ lib, fetchFromGitHub, python3, intltool, file, wrapGAppsHook3, gtk-vnc , vte, avahi, dconf, gobject-introspection, libvirt-glib, system-libvirt , gsettings-desktop-schemas, gst_all_1, libosinfo, gnome, gtksourceview4, docutils, cpio , e2fsprogs, findutils, gzip, cdrtools, xorriso, fetchpatch @@ -34,7 +34,7 @@ python3.pkgs.buildPythonApplication rec { intltool file gobject-introspection # for setup hook populating GI_TYPELIB_PATH docutils - wrapGAppsHook + wrapGAppsHook3 ] ++ lib.optional stdenv.isDarwin desktopToDarwinBundle; buildInputs = [ diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/applications/virtualization/virt-viewer/default.nix index 1aca58af5c77b..b0bf423605f37 100644 --- a/pkgs/applications/virtualization/virt-viewer/default.nix +++ b/pkgs/applications/virtualization/virt-viewer/default.nix @@ -30,7 +30,7 @@ , spice-protocol , spiceSupport ? true , vte -, wrapGAppsHook +, wrapGAppsHook3 }: with lib; @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { pkg-config python3 shared-mime-info - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 314d8136b852c..3b0783a1509b5 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -118,11 +118,11 @@ in stdenv.mkDerivation { # we don't take any chances and only apply it if people actually want to use KVM support. ++ optional enableKvm (fetchpatch (let - patchVersion = "20240325"; + patchVersion = "20240502"; in { name = "virtualbox-${version}-kvm-dev-${patchVersion}.patch"; url = "https://github.com/cyberus-technology/virtualbox-kvm/releases/download/dev-${patchVersion}/kvm-backend-${version}-dev-${patchVersion}.patch"; - hash = "sha256-D1ua8X5Iyw/I89PtskiGdnGr4NhdFtI93ThltiOcu8w="; + hash = "sha256-KokIrrAoJutHzPg6e5YAJgDGs+nQoVjapmyn9kG5tV0="; })) ++ [ ./qt-dependency-paths.patch diff --git a/pkgs/applications/window-managers/wayfire/wcm.nix b/pkgs/applications/window-managers/wayfire/wcm.nix index fec3b1bfc7163..df1b1cfea9b83 100644 --- a/pkgs/applications/window-managers/wayfire/wcm.nix +++ b/pkgs/applications/window-managers/wayfire/wcm.nix @@ -4,7 +4,7 @@ , meson , ninja , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , wayfire , wf-shell , wayland-scanner @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { ninja pkg-config wayland-scanner - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ |