diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2024-04-26 22:24:03 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2024-04-27 02:23:22 +0200 |
commit | eb04659fc2623c05643ed14633423758d3c6c6a4 (patch) | |
tree | 6ee1df69158b4ed56241c051d84e5b0bd2c74e12 /pkgs/development/web | |
parent | 37383113cc1df4b1441e0d8b38bac5357f94f6be (diff) |
treewide: wrapGAppsHook → wrapGAppsHook3
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)
Diffstat (limited to 'pkgs/development/web')
-rw-r--r-- | pkgs/development/web/cog/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/web/cypress/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/web/insomnia/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/web/postman/linux.nix | 4 | ||||
-rw-r--r-- | pkgs/development/web/publii/default.nix | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/pkgs/development/web/cog/default.nix b/pkgs/development/web/cog/default.nix index c350149f32e23..0a9be7e5682b4 100644 --- a/pkgs/development/web/cog/default.nix +++ b/pkgs/development/web/cog/default.nix @@ -10,7 +10,7 @@ , glib-networking , webkitgtk , makeWrapper -, wrapGAppsHook +, wrapGAppsHook3 , gnome , gdk-pixbuf }: @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { pkg-config wayland makeWrapper - wrapGAppsHook + wrapGAppsHook3 ]; depsBuildsBuild = [ diff --git a/pkgs/development/web/cypress/default.nix b/pkgs/development/web/cypress/default.nix index dedd94230b8c8..8ce3c5aef739a 100644 --- a/pkgs/development/web/cypress/default.nix +++ b/pkgs/development/web/cypress/default.nix @@ -10,7 +10,7 @@ , stdenv , udev , unzip -, wrapGAppsHook +, wrapGAppsHook3 , xorg }: @@ -40,7 +40,7 @@ in stdenv.mkDerivation rec { # don't remove runtime deps dontPatchELF = true; - nativeBuildInputs = [ autoPatchelfHook wrapGAppsHook unzip ]; + nativeBuildInputs = [ autoPatchelfHook wrapGAppsHook3 unzip ]; buildInputs = with xorg; [ libXScrnSaver diff --git a/pkgs/development/web/insomnia/default.nix b/pkgs/development/web/insomnia/default.nix index 422c6b7378897..0d9b0e422b507 100644 --- a/pkgs/development/web/insomnia/default.nix +++ b/pkgs/development/web/insomnia/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, makeWrapper, fetchurl, dpkg, alsa-lib, atk, cairo, cups, dbus, expat , fontconfig, freetype, gdk-pixbuf, glib, pango, mesa, nspr, nss, gtk3 -, at-spi2-atk, gsettings-desktop-schemas, gobject-introspection, wrapGAppsHook +, at-spi2-atk, gsettings-desktop-schemas, gobject-introspection, wrapGAppsHook3 , libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext , libXfixes, libXi, libXrandr, libXrender, libXtst, libxcb, libxshmfence, nghttp2 , libudev0-shim, glibc, curl, openssl, autoPatchelfHook }: @@ -28,7 +28,7 @@ in stdenv.mkDerivation rec { dpkg makeWrapper gobject-introspection - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/development/web/postman/linux.nix b/pkgs/development/web/postman/linux.nix index 763337fd25384..64f5deb1b48ff 100644 --- a/pkgs/development/web/postman/linux.nix +++ b/pkgs/development/web/postman/linux.nix @@ -2,7 +2,7 @@ , stdenv , fetchurl , makeDesktopItem -, wrapGAppsHook +, wrapGAppsHook3 , atk , at-spi2-atk , at-spi2-core @@ -126,7 +126,7 @@ stdenv.mkDerivation rec { xorg.libxshmfence ]; - nativeBuildInputs = [ wrapGAppsHook copyDesktopItems ]; + nativeBuildInputs = [ wrapGAppsHook3 copyDesktopItems ]; installPhase = '' runHook preInstall diff --git a/pkgs/development/web/publii/default.nix b/pkgs/development/web/publii/default.nix index e09e21f174a71..9792f2686454e 100644 --- a/pkgs/development/web/publii/default.nix +++ b/pkgs/development/web/publii/default.nix @@ -3,7 +3,7 @@ , fetchurl , autoPatchelfHook , makeShellWrapper -, wrapGAppsHook +, wrapGAppsHook3 , alsa-lib , at-spi2-atk , at-spi2-core @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoPatchelfHook makeShellWrapper - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ |