Unverified Commit 7b01c275 authored by Aleksana's avatar Aleksana Committed by GitHub
Browse files

Merge pull request #301865 from Aleksanaa/wrapGAppsHook4-fix 

treewide: replace wrapGAppsHook with wrapGAppsHook4 for gtk4 apps
parents a397d87a 9dddc116

pkgs/applications/audio/parlatype/default.nix

+4 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
, ninja

, pkg-config

, python3

, wrapGAppsHook

, wrapGAppsHook4

}:



stdenv.mkDerivation rec {
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec { 
    ninja

    pkg-config

    python3

    wrapGAppsHook

    wrapGAppsHook4

  ];



  buildInputs = [
@@ -58,6 +58,8 @@ stdenv.mkDerivation rec { 
  ];



  postPatch = ''

    substituteInPlace data/meson_post_install.py \

      --replace-fail 'gtk-update-icon-cache' 'gtk4-update-icon-cache'

    patchShebangs data/meson_post_install.py

    patchShebangs libparlatype/tests/data/generate_config_data

  '';

pkgs/applications/audio/zrythm/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ 
, sratom

, texi2html

, vamp-plugin-sdk

, wrapGAppsHook

, wrapGAppsHook4

, xdg-utils

, xxHash

, zix
@@ -112,7 +112,7 @@ stdenv.mkDerivation rec { 
    python3.pkgs.sphinx

    sassc

    texi2html

    wrapGAppsHook

    wrapGAppsHook4

  ];



  buildInputs = [

pkgs/applications/display-managers/greetd/regreet.nix

+2 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
, rustPlatform

, fetchFromGitHub

, pkg-config

, wrapGAppsHook

, wrapGAppsHook4

, glib

, gtk4

, pango
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { 


  buildFeatures = [ "gtk4_8" ];



  nativeBuildInputs = [ pkg-config wrapGAppsHook];

  nativeBuildInputs = [ pkg-config wrapGAppsHook4 ];

  buildInputs = [ glib gtk4 pango librsvg ];



  meta = with lib; {

pkgs/applications/graphics/conjure/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
, lib

, libadwaita

, python3Packages

, wrapGAppsHook

, wrapGAppsHook4

, meson

, ninja

, desktop-file-utils
@@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec { 


  nativeBuildInputs = [

    gobject-introspection

    wrapGAppsHook

    wrapGAppsHook4

    desktop-file-utils

    appstream-glib

    meson

pkgs/applications/graphics/curtail/default.nix

+2 −2
Original line number Diff line number Diff line 
{ lib

, python3

, fetchFromGitHub

, wrapGAppsHook

, wrapGAppsHook4

, appstream-glib

, desktop-file-utils

, gettext
@@ -31,7 +31,7 @@ python3.pkgs.buildPythonApplication rec { 
  };



  nativeBuildInputs = [

    wrapGAppsHook

    wrapGAppsHook4

    appstream-glib

    desktop-file-utils

    gettext