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/applications/science/astronomy | |
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/applications/science/astronomy')
4 files changed, 8 insertions, 8 deletions
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 ]; |