diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2022-10-19 05:24:28 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2022-10-19 05:24:28 +0200 |
commit | 457f28f6f85eea1b1671d62d2abe39297c9c90f7 (patch) | |
tree | 3c6e68534e7bfcde19893c830af7498b0606e6d2 /pkgs/desktops/gnome/apps/gnome-weather | |
parent | a25e03e76ae1e0367419db1de009e1139d08de68 (diff) | |
parent | 1aa7d4e6c61526606d9e26f939cdb60ec8f45fcd (diff) |
Merge branch 'master' into staging-next
; Conflicts: ; pkgs/development/tools/codespell/default.nix codespell 2.2.2 switched to pyproject & setuptools_scm: https://github.com/codespell-project/codespell/pull/2523
Diffstat (limited to 'pkgs/desktops/gnome/apps/gnome-weather')
-rw-r--r-- | pkgs/desktops/gnome/apps/gnome-weather/default.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/desktops/gnome/apps/gnome-weather/default.nix b/pkgs/desktops/gnome/apps/gnome-weather/default.nix index bc0fec6cfa71f..1e7860a697876 100644 --- a/pkgs/desktops/gnome/apps/gnome-weather/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-weather/default.nix @@ -5,7 +5,7 @@ , gnome , gtk4 , libadwaita -, wrapGAppsHook +, wrapGAppsHook4 , gjs , gobject-introspection , libgweather @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { pkg-config meson ninja - wrapGAppsHook + wrapGAppsHook4 python3 gobject-introspection gjs @@ -56,6 +56,8 @@ stdenv.mkDerivation rec { chmod +x meson_post_install.py patchShebangs meson_post_install.py + substituteInPlace meson_post_install.py \ + --replace gtk-update-icon-cache gtk4-update-icon-cache ''; passthru = { @@ -70,6 +72,6 @@ stdenv.mkDerivation rec { description = "Access current weather conditions and forecasts"; maintainers = teams.gnome.members; license = licenses.gpl2Plus; - platforms = platforms.linux; + platforms = platforms.unix; }; } |