Merge pull request #195267 from figsoda/wrap-gtk4
treewide: switch to wrapGAppsHook4
This commit is contained in:
commit
d1fd1b4de2
|
@ -4,7 +4,7 @@
|
|||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, wrapGAppsHook
|
||||
, wrapGAppsHook4
|
||||
, desktop-file-utils
|
||||
, appstream-glib
|
||||
, python3Packages
|
||||
|
@ -30,9 +30,8 @@ python3Packages.buildPythonApplication rec {
|
|||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
wrapGAppsHook
|
||||
wrapGAppsHook4
|
||||
desktop-file-utils
|
||||
appstream-glib
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
@ -57,6 +56,8 @@ python3Packages.buildPythonApplication rec {
|
|||
|
||||
postPatch = ''
|
||||
patchShebangs build-aux/meson/postinstall.py
|
||||
substituteInPlace build-aux/meson/postinstall.py \
|
||||
--replace gtk-update-icon-cache gtk4-update-icon-cache
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
, openssl
|
||||
, alsa-lib
|
||||
, libpulseaudio
|
||||
, wrapGAppsHook
|
||||
, wrapGAppsHook4
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
|
|||
rustPlatform.rust.cargo
|
||||
rustPlatform.cargoSetupHook
|
||||
rustPlatform.rust.rustc
|
||||
wrapGAppsHook
|
||||
wrapGAppsHook4
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
@ -67,6 +67,8 @@ stdenv.mkDerivation rec {
|
|||
postPatch = ''
|
||||
chmod +x build-aux/cargo.sh
|
||||
patchShebangs build-aux/cargo.sh build-aux/meson/postinstall.py
|
||||
substituteInPlace build-aux/meson/postinstall.py \
|
||||
--replace gtk-update-icon-cache gtk4-update-icon-cache
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
, fetchFromGitHub
|
||||
, glib
|
||||
, pkg-config
|
||||
, wrapGAppsHook
|
||||
, wrapGAppsHook4
|
||||
, gtk4
|
||||
}:
|
||||
|
||||
|
@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
cargoSha256 = "sha256-cUE2IZOunR/NIo/qytORRfNqCsf87LfpKA8o/v4Nkhk=";
|
||||
|
||||
nativeBuildInputs = [ glib pkg-config wrapGAppsHook ];
|
||||
nativeBuildInputs = [ glib pkg-config wrapGAppsHook4 ];
|
||||
|
||||
buildInputs = [ gtk4 ];
|
||||
|
||||
|
@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec {
|
|||
"--skip=file_list::tests"
|
||||
|
||||
# sometimes fails on darwin
|
||||
"image_list::tests::save_current_image_overwrites_image_at_current_image_path_when_filename_is_set_to_none"
|
||||
"--skip=image_list::tests::save_current_image_overwrites_image_at_current_image_path_when_filename_is_set_to_none"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, glib
|
||||
, meson
|
||||
, ninja
|
||||
|
@ -10,10 +11,11 @@
|
|||
, pango
|
||||
, libinput
|
||||
, gtk4
|
||||
, wrapGAppsHook
|
||||
, wrapGAppsHook4
|
||||
, libxkbcommon
|
||||
, pkg-config
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "showmethekey";
|
||||
version = "1.7.3";
|
||||
|
@ -25,6 +27,14 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "sha256-hq4X4dG25YauMjsNXC6Flco9pEpVj3EM2JiFWbRrPaA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "use-gtk4-update-icon-cache.patch";
|
||||
url = "https://github.com/alynxzhou/showmethekey/commit/c73102dc2825d00cbaf323fcfc96736381dc67ae.patch";
|
||||
sha256 = "sha256-6QDY5eQ9A8q3LZeD7v6WI/4vYXc/XXVY/WENA1nvIKo=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
glib
|
||||
meson
|
||||
|
@ -36,7 +46,7 @@ stdenv.mkDerivation rec {
|
|||
libevdev
|
||||
libinput
|
||||
libxkbcommon
|
||||
wrapGAppsHook
|
||||
wrapGAppsHook4
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
, ninja
|
||||
, pkg-config
|
||||
, rustPlatform
|
||||
, wrapGAppsHook
|
||||
, wrapGAppsHook4
|
||||
, gtksourceview5
|
||||
, libadwaita
|
||||
}:
|
||||
|
@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
|
|||
rustPlatform.cargoSetupHook
|
||||
rustPlatform.rust.cargo
|
||||
rustPlatform.rust.rustc
|
||||
wrapGAppsHook
|
||||
wrapGAppsHook4
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
, gdk-pixbuf
|
||||
, atk
|
||||
, gtk4
|
||||
, wrapGAppsHook
|
||||
, wrapGAppsHook4
|
||||
, gobject-introspection
|
||||
, xvfb-run
|
||||
, testers
|
||||
|
@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
wrapGAppsHook
|
||||
wrapGAppsHook4
|
||||
gobject-introspection
|
||||
];
|
||||
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
, ninja
|
||||
, pkg-config
|
||||
, scdoc
|
||||
, wrapGAppsHook
|
||||
, wrapGAppsHook4
|
||||
, gtk4
|
||||
, qrencode
|
||||
}:
|
||||
|
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
|
|||
# patch systemd service to pass necessary environments and use absolute paths
|
||||
patches = [ ./systemd-service.patch ];
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkg-config scdoc wrapGAppsHook ];
|
||||
nativeBuildInputs = [ meson ninja pkg-config scdoc wrapGAppsHook4 ];
|
||||
|
||||
buildInputs = [ gtk4 qrencode ];
|
||||
|
||||
|
|
Loading…
Reference in a new issue