cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

treewide: wrapGAppsHook → wrapGAppsHook3

Browse source 
This was achieved using the following command:

    sd 'wrapGAppsHook\b' wrapGAppsHook3 (rg -l 'wrapGAppsHook\b')

And then manually reverted the following changes:

- alias in top-level.nix
- function name in wrap-gapps-hook.sh
- comment in postFixup of at-spi2-core
- comment in gtk4
- comment in preFixup of 1password-gui/linux.nix
- comment in postFixup of qgis/unwrapped-ltr.nix and qgis/unwrapped.nix
- comment in postFixup of telegram-desktop
- comment in postFixup of fwupd
- buildCommand of mongodb-compass
- postFixup of xflux-gui
- comment in a patch in kdePackages.kde-gtk-config and plasma5Packages.kde-gtk-config
- description of programs.sway.wrapperFeatures.gtk NixOS option (manual rebuild)
This commit is contained in:
Jan Tojnar 2024-04-26 22:24:03 +02:00
parent 37383113cc
commit eb04659fc2
886 changed files with 1793 additions and 1793 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc/languages-frameworks/gnome.section.md
View file

@ -167,7 +167,7 @@ python3.pkgs.buildPythonApplication {
version = "3.32.2";
nativeBuildInputs = [
wrapGAppsHook
wrapGAppsHook3
gobject-introspection
# ...
];
@ -189,7 +189,7 @@ mkDerivation {
version = "3.47.0";
nativeBuildInputs = [
wrapGAppsHook
wrapGAppsHook3
qmake
# ...
];

2
nixos/tests/installed-tests/gnome-photos.nix
View file

@ -13,7 +13,7 @@ makeInstalledTest {
(stdenv.mkDerivation {
name = "desktop-gsettings";
dontUnpack = true;
nativeBuildInputs = [ glib wrapGAppsHook ];
nativeBuildInputs = [ glib wrapGAppsHook3 ];
buildInputs = [ gsettings-desktop-schemas ];
installPhase = ''
runHook preInstall

4
pkgs/applications/accessibility/dasher/default.nix
View file

@ -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

4
pkgs/applications/accessibility/mousetweaks/default.nix
View file

@ -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

4
pkgs/applications/accessibility/squeekboard/default.nix
View file

@ -17,7 +17,7 @@
, rustPlatform
, rustc
, feedbackd
, wrapGAppsHook
, wrapGAppsHook3
, fetchpatch
, nixosTests
}:
@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
pkg-config
glib
wayland
wrapGAppsHook
wrapGAppsHook3
rustPlatform.cargoSetupHook
cargo
rustc

4
pkgs/applications/audio/ario/default.nix
View file

@ -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 = [

4
pkgs/applications/audio/audacity/default.nix
View file

@ -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
];

4
pkgs/applications/audio/audio-recorder/default.nix
View file

@ -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

4
pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix
View file

@ -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

4
pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix
View file

@ -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

4
pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix
View file

@ -19,7 +19,7 @@
, pango
, pipewire
, pulseaudio
, wrapGAppsHook
, wrapGAppsHook3
, xdg-utils
, xorg
, zlib
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
sha256 = "sha256-U1Qp7/7kAr1IEcv256I2J/sb5MYxfR20Pi5N8WaVh2U=";
};
nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook ];
nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook3 ];
unpackCmd = ''
mkdir -p root

4
pkgs/applications/audio/buzztrax/default.nix
View file

@ -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
];

4
pkgs/applications/audio/deadbeef/default.nix
View file

@ -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;

4
pkgs/applications/audio/denemo/default.nix
View file

@ -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

4
pkgs/applications/audio/easyabc/default.nix
View file

@ -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

4
pkgs/applications/audio/easytag/default.nix
View file

@ -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

4
pkgs/applications/audio/exaile/default.nix
View file

@ -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

4
pkgs/applications/audio/gmpc/default.nix
View file

@ -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

4
pkgs/applications/audio/goodvibes/default.nix
View file

@ -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
];

4
pkgs/applications/audio/gpodder/default.nix
View file

@ -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
];

4
pkgs/applications/audio/gspeech/default.nix
View file

@ -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

4
pkgs/applications/audio/gst123/default.nix
View file

@ -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 = [

4
pkgs/applications/audio/guitarix/default.nix
View file

@ -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 = [

4
pkgs/applications/audio/hivelytracker/default.nix
View file

@ -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 = [

4
pkgs/applications/audio/hushboard/default.nix
View file

@ -9,7 +9,7 @@
, pycairo
, pygobject3
, six
, wrapGAppsHook
, wrapGAppsHook3
, xlib
}:
@ -25,7 +25,7 @@ buildPythonApplication {
};
nativeBuildInputs = [
wrapGAppsHook
wrapGAppsHook3
gobject-introspection
];

4
pkgs/applications/audio/indicator-sound-switcher/default.nix
View file

@ -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
];

4
pkgs/applications/audio/lingot/default.nix
View file

@ -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 = [

4
pkgs/applications/audio/lollypop/default.nix
View file

@ -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; [

4
pkgs/applications/audio/lyrebird/default.nix
View file

@ -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 ];

6
pkgs/applications/audio/mpdevil/default.nix
View file

@ -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;

4
pkgs/applications/audio/muso/default.nix
View file

@ -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 = ''

4
pkgs/applications/audio/paprefs/default.nix
View file

@ -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 = [

4
pkgs/applications/audio/pavucontrol/default.nix
View file

@ -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" ];

4
pkgs/applications/audio/pithos/default.nix
View file

@ -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

4
pkgs/applications/audio/praat/default.nix
View file

@ -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 = [

4
pkgs/applications/audio/pulseeffects-legacy/default.nix
View file

@ -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 = [

4
pkgs/applications/audio/quodlibet/default.nix
View file

@ -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

4
pkgs/applications/audio/radiotray-ng/default.nix
View file

@ -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

4
pkgs/applications/audio/rhythmbox/default.nix
View file

@ -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
];

4
pkgs/applications/audio/sfxr/default.nix
View file

@ -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)" ];

4
pkgs/applications/audio/sonata/default.nix
View file

@ -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 = [

4
pkgs/applications/audio/sound-juicer/default.nix
View file

@ -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 = [

4
pkgs/applications/audio/soundconverter/default.nix
View file

@ -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
];

4
pkgs/applications/audio/spek/default.nix
View file

@ -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 ];

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

@ -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;

4
pkgs/applications/audio/sublime-music/default.nix
View file

@ -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 = ''

4
pkgs/applications/audio/transcribe/default.nix
View file

@ -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; [

4
pkgs/applications/audio/tuner/default.nix
View file

@ -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
];

4
pkgs/applications/audio/vcv-rack/default.nix
View file

@ -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

4
pkgs/applications/audio/vocal/default.nix
View file

@ -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; [

4
pkgs/applications/audio/ymuse/default.nix
View file

@ -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

4
pkgs/applications/backup/timeshift/wrapper.nix
View file

@ -1,6 +1,6 @@
{ stdenvNoCC
, lib
, wrapGAppsHook
, wrapGAppsHook3
, gdk-pixbuf
, librsvg
, xorg
@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation {
nativeBuildInputs = [
xorg.lndir
wrapGAppsHook
wrapGAppsHook3
];
installPhase = ''

4
pkgs/applications/display-managers/greetd/gtkgreet.nix
View file

@ -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 = [

4
pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix
View file

@ -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 = [

4
pkgs/applications/display-managers/lightdm-mini-greeter/default.nix
View file

@ -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" ];

4
pkgs/applications/display-managers/lightdm-slick-greeter/default.nix
View file

@ -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
];

4
pkgs/applications/display-managers/lightdm-tiny-greeter/default.nix
View file

@ -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 != "") ''

6
pkgs/applications/display-managers/lightdm/gtk-greeter.nix
View file

@ -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 = ''

4
pkgs/applications/editors/apostrophe/default.nix
View file

@ -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

4
pkgs/applications/editors/bluefish/default.nix
View file

@ -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

4
pkgs/applications/editors/bluej/default.nix
View file

@ -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;

4
pkgs/applications/editors/codeblocks/default.nix
View file

@ -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;

4
pkgs/applications/editors/emacs/make-emacs.nix
View file

@ -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

4
pkgs/applications/editors/formiko/default.nix
View file

@ -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
];

4
pkgs/applications/editors/geany/default.nix
View file

@ -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 = [

4
pkgs/applications/editors/gedit/default.nix
View file

@ -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

8
pkgs/applications/editors/gnome-inform7/default.nix
View file

@ -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

4
pkgs/applications/editors/gnome-latex/default.nix
View file

@ -5,7 +5,7 @@
, gtk-doc
, vala
, gobject-introspection
, wrapGAppsHook
, wrapGAppsHook3
, gsettings-desktop-schemas
, gspell
, libgedit-amtk
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
gtk-doc
vala
gobject-introspection
wrapGAppsHook
wrapGAppsHook3
itstool
gettext
];

4
pkgs/applications/editors/gobby/default.nix
View file

@ -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";

4
pkgs/applications/editors/greenfoot/default.nix
View file

@ -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;

4
pkgs/applications/editors/kile/default.nix
View file

@ -3,7 +3,7 @@
, fetchurl
, extra-cmake-modules
, kdoctools
, wrapGAppsHook
, wrapGAppsHook3
, qtscript
, kconfig
, kcrash
@ -32,7 +32,7 @@ mkDerivation rec {
nativeBuildInputs = [
extra-cmake-modules
wrapGAppsHook
wrapGAppsHook3
kdoctools
];

4
pkgs/applications/editors/l3afpad/default.nix
View file

@ -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; {

4
pkgs/applications/editors/lapce/default.nix
View file

@ -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
];

4
pkgs/applications/editors/lifeograph/default.nix
View file

@ -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 = [

4
pkgs/applications/editors/marker/default.nix
View file

@ -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 = [

4
pkgs/applications/editors/mindforger/default.nix
View file

@ -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;

4
pkgs/applications/editors/pinegrow/default.nix
View file

@ -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 = [

4
pkgs/applications/editors/pulsar/default.nix
View file

@ -2,7 +2,7 @@
, stdenv
, git
, fetchurl
, wrapGAppsHook
, wrapGAppsHook3
, alsa-lib
, at-spi2-atk
, cairo
@ -90,7 +90,7 @@ stdenv.mkDerivation rec {
];
nativeBuildInputs = [
wrapGAppsHook
wrapGAppsHook3
copyDesktopItems
asar
];

4
pkgs/applications/editors/sublime/3/common.nix
View file

@ -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 = ''

4
pkgs/applications/editors/sublime/4/common.nix
View file

@ -17,7 +17,7 @@
cairo,
pango,
makeWrapper,
wrapGAppsHook,
wrapGAppsHook3,
writeShellScript,
common-updater-scripts,
curl,
@ -80,7 +80,7 @@ let
nativeBuildInputs = [
makeWrapper
wrapGAppsHook
wrapGAppsHook3
];
buildPhase = ''

4
pkgs/applications/editors/texmaker/default.nix
View file

@ -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 = [

4
pkgs/applications/editors/thiefmd/default.nix
View file

@ -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
];

4
pkgs/applications/editors/tijolo/default.nix
View file

@ -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 ];

4
pkgs/applications/editors/vim/full.nix
View file

@ -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 = [

6
pkgs/applications/editors/vim/plugins/overrides.nix
View file

@ -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 ]))

2
pkgs/applications/editors/vscode/generic.nix
View file

@ -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;

4
pkgs/applications/editors/xed-editor/default.nix
View file

@ -12,7 +12,7 @@
, python3
, meson
, ninja
, wrapGAppsHook
, wrapGAppsHook3
, intltool
, itstool
}:
@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
itstool
ninja
python3
wrapGAppsHook
wrapGAppsHook3
];
buildInputs = [

4
pkgs/applications/emulators/bsnes/ares/default.nix
View file

@ -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
];

4
pkgs/applications/emulators/bsnes/bsnes-hd/default.nix
View file

@ -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 ]

4
pkgs/applications/emulators/cemu/default.nix
View file

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub
, addOpenGLRunpath
, wrapGAppsHook
, wrapGAppsHook3
, cmake
, glslang
, nasm
@ -64,7 +64,7 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [
addOpenGLRunpath
wrapGAppsHook
wrapGAppsHook3
cmake
glslang
nasm

4
pkgs/applications/emulators/desmume/default.nix
View file

@ -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

4
pkgs/applications/emulators/fuse-emulator/default.nix
View file

@ -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 ];

4
pkgs/applications/emulators/mgba/default.nix
View file

@ -13,7 +13,7 @@
, minizip
, pkg-config
, stdenv
, wrapGAppsHook
, wrapGAppsHook3
, enableDiscordRpc ? false
}:
@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
SDL2
cmake
pkg-config
wrapGAppsHook
wrapGAppsHook3
wrapQtAppsHook
];

4
pkgs/applications/emulators/pcem/default.nix
View file

@ -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;

4
pkgs/applications/emulators/pcsxr/default.nix
View file

@ -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

4
pkgs/applications/emulators/ruffle/default.nix
View file

@ -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 = [

6
pkgs/applications/emulators/sameboy/default.nix
View file

@ -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 = [

4
pkgs/applications/emulators/vice/default.nix
View file

@ -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 = [

4
pkgs/applications/file-managers/krusader/default.nix
View file

@ -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 = [

4
pkgs/applications/file-managers/pcmanfm/default.nix
View file

@ -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";

Some files were not shown because too many files have changed in this diff Show more