mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-20 04:19:00 +02:00
Merge pull request #301865 from Aleksanaa/wrapGAppsHook4-fix
treewide: replace wrapGAppsHook with wrapGAppsHook4 for gtk4 apps
This commit is contained in:
commit
7b01c27540
|
@ -16,7 +16,7 @@
|
||||||
, ninja
|
, ninja
|
||||||
, pkg-config
|
, pkg-config
|
||||||
, python3
|
, python3
|
||||||
, wrapGAppsHook
|
, wrapGAppsHook4
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
|
@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
|
||||||
ninja
|
ninja
|
||||||
pkg-config
|
pkg-config
|
||||||
python3
|
python3
|
||||||
wrapGAppsHook
|
wrapGAppsHook4
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
|
@ -58,6 +58,8 @@ stdenv.mkDerivation rec {
|
||||||
];
|
];
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
substituteInPlace data/meson_post_install.py \
|
||||||
|
--replace-fail 'gtk-update-icon-cache' 'gtk4-update-icon-cache'
|
||||||
patchShebangs data/meson_post_install.py
|
patchShebangs data/meson_post_install.py
|
||||||
patchShebangs libparlatype/tests/data/generate_config_data
|
patchShebangs libparlatype/tests/data/generate_config_data
|
||||||
'';
|
'';
|
||||||
|
|
|
@ -64,7 +64,7 @@
|
||||||
, sratom
|
, sratom
|
||||||
, texi2html
|
, texi2html
|
||||||
, vamp-plugin-sdk
|
, vamp-plugin-sdk
|
||||||
, wrapGAppsHook
|
, wrapGAppsHook4
|
||||||
, xdg-utils
|
, xdg-utils
|
||||||
, xxHash
|
, xxHash
|
||||||
, zix
|
, zix
|
||||||
|
@ -112,7 +112,7 @@ stdenv.mkDerivation rec {
|
||||||
python3.pkgs.sphinx
|
python3.pkgs.sphinx
|
||||||
sassc
|
sassc
|
||||||
texi2html
|
texi2html
|
||||||
wrapGAppsHook
|
wrapGAppsHook4
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
, rustPlatform
|
, rustPlatform
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, pkg-config
|
, pkg-config
|
||||||
, wrapGAppsHook
|
, wrapGAppsHook4
|
||||||
, glib
|
, glib
|
||||||
, gtk4
|
, gtk4
|
||||||
, pango
|
, pango
|
||||||
|
@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec {
|
||||||
|
|
||||||
buildFeatures = [ "gtk4_8" ];
|
buildFeatures = [ "gtk4_8" ];
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config wrapGAppsHook];
|
nativeBuildInputs = [ pkg-config wrapGAppsHook4 ];
|
||||||
buildInputs = [ glib gtk4 pango librsvg ];
|
buildInputs = [ glib gtk4 pango librsvg ];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
, lib
|
, lib
|
||||||
, libadwaita
|
, libadwaita
|
||||||
, python3Packages
|
, python3Packages
|
||||||
, wrapGAppsHook
|
, wrapGAppsHook4
|
||||||
, meson
|
, meson
|
||||||
, ninja
|
, ninja
|
||||||
, desktop-file-utils
|
, desktop-file-utils
|
||||||
|
@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec {
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
gobject-introspection
|
gobject-introspection
|
||||||
wrapGAppsHook
|
wrapGAppsHook4
|
||||||
desktop-file-utils
|
desktop-file-utils
|
||||||
appstream-glib
|
appstream-glib
|
||||||
meson
|
meson
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{ lib
|
{ lib
|
||||||
, python3
|
, python3
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, wrapGAppsHook
|
, wrapGAppsHook4
|
||||||
, appstream-glib
|
, appstream-glib
|
||||||
, desktop-file-utils
|
, desktop-file-utils
|
||||||
, gettext
|
, gettext
|
||||||
|
@ -31,7 +31,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
wrapGAppsHook
|
wrapGAppsHook4
|
||||||
appstream-glib
|
appstream-glib
|
||||||
desktop-file-utils
|
desktop-file-utils
|
||||||
gettext
|
gettext
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
, pkg-config
|
, pkg-config
|
||||||
, python3
|
, python3
|
||||||
, stdenv
|
, stdenv
|
||||||
, wrapGAppsHook
|
, wrapGAppsHook4
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
|
@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
meson
|
meson
|
||||||
ninja
|
ninja
|
||||||
pkg-config
|
pkg-config
|
||||||
wrapGAppsHook
|
wrapGAppsHook4
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
|
@ -46,6 +46,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
];
|
];
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
substituteInPlace build-aux/meson/postinstall.py \
|
||||||
|
--replace-fail 'gtk-update-icon-cache' 'gtk4-update-icon-cache'
|
||||||
patchShebangs build-aux/meson/postinstall.py
|
patchShebangs build-aux/meson/postinstall.py
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
, ninja
|
, ninja
|
||||||
, pkg-config
|
, pkg-config
|
||||||
, rustc
|
, rustc
|
||||||
, wrapGAppsHook
|
, wrapGAppsHook4
|
||||||
, python3
|
, python3
|
||||||
, git
|
, git
|
||||||
, glib
|
, glib
|
||||||
|
@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
|
||||||
meson
|
meson
|
||||||
ninja
|
ninja
|
||||||
pkg-config
|
pkg-config
|
||||||
wrapGAppsHook
|
wrapGAppsHook4
|
||||||
python3
|
python3
|
||||||
git
|
git
|
||||||
desktop-file-utils
|
desktop-file-utils
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
, gobject-introspection
|
, gobject-introspection
|
||||||
, vulkan-tools
|
, vulkan-tools
|
||||||
, python3
|
, python3
|
||||||
, wrapGAppsHook
|
, wrapGAppsHook4
|
||||||
, gdk-pixbuf
|
, gdk-pixbuf
|
||||||
, lsb-release
|
, lsb-release
|
||||||
, glxinfo
|
, glxinfo
|
||||||
|
@ -35,7 +35,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||||
meson
|
meson
|
||||||
ninja
|
ninja
|
||||||
gobject-introspection
|
gobject-introspection
|
||||||
wrapGAppsHook
|
wrapGAppsHook4
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
, python3Packages
|
, python3Packages
|
||||||
, gobject-introspection
|
, gobject-introspection
|
||||||
, libadwaita
|
, libadwaita
|
||||||
, wrapGAppsHook
|
, wrapGAppsHook4
|
||||||
, lmmath
|
, lmmath
|
||||||
}:
|
}:
|
||||||
|
|
||||||
|
@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec {
|
||||||
hash = "sha256-GjNpaorxkkhZsqrKq4kO5nqF5+4I4tmSc023AZpY8Sw=";
|
hash = "sha256-GjNpaorxkkhZsqrKq4kO5nqF5+4I4tmSc023AZpY8Sw=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ gobject-introspection wrapGAppsHook ];
|
nativeBuildInputs = [ gobject-introspection wrapGAppsHook4 ];
|
||||||
buildInputs = [ libadwaita ];
|
buildInputs = [ libadwaita ];
|
||||||
|
|
||||||
propagatedBuildInputs = with python3Packages; [
|
propagatedBuildInputs = with python3Packages; [
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
, gettext
|
, gettext
|
||||||
, desktop-file-utils
|
, desktop-file-utils
|
||||||
, appstream-glib
|
, appstream-glib
|
||||||
, wrapGAppsHook
|
, wrapGAppsHook4
|
||||||
, python3
|
, python3
|
||||||
# Not native
|
# Not native
|
||||||
, gst_all_1
|
, gst_all_1
|
||||||
|
@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
gettext
|
gettext
|
||||||
desktop-file-utils
|
desktop-file-utils
|
||||||
appstream-glib
|
appstream-glib
|
||||||
wrapGAppsHook
|
wrapGAppsHook4
|
||||||
python3
|
python3
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{ lib, stdenv, fetchFromGitHub
|
{ lib, stdenv, fetchFromGitHub
|
||||||
, buildPackages
|
, buildPackages
|
||||||
, vala, cmake, ninja, wrapGAppsHook, pkg-config, gettext
|
, vala, cmake, ninja, wrapGAppsHook4, pkg-config, gettext
|
||||||
, gobject-introspection, glib, gdk-pixbuf, gtk4, glib-networking
|
, gobject-introspection, glib, gdk-pixbuf, gtk4, glib-networking
|
||||||
, libadwaita
|
, libadwaita
|
||||||
, libnotify, libsoup, libgee
|
, libnotify, libsoup, libgee
|
||||||
|
@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
|
||||||
cmake
|
cmake
|
||||||
ninja # https://github.com/dino/dino/issues/230
|
ninja # https://github.com/dino/dino/issues/230
|
||||||
pkg-config
|
pkg-config
|
||||||
wrapGAppsHook
|
wrapGAppsHook4
|
||||||
gettext
|
gettext
|
||||||
gobject-introspection
|
gobject-introspection
|
||||||
];
|
];
|
||||||
|
|
|
@ -20,7 +20,7 @@
|
||||||
, python3
|
, python3
|
||||||
, webkitgtk_6_0
|
, webkitgtk_6_0
|
||||||
, blueprint-compiler
|
, blueprint-compiler
|
||||||
, wrapGAppsHook
|
, wrapGAppsHook4
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
|
@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
|
||||||
pkg-config
|
pkg-config
|
||||||
python3
|
python3
|
||||||
blueprint-compiler
|
blueprint-compiler
|
||||||
wrapGAppsHook
|
wrapGAppsHook4
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
|
|
|
@ -18,9 +18,8 @@
|
||||||
, libgee
|
, libgee
|
||||||
, callPackage
|
, callPackage
|
||||||
, python3
|
, python3
|
||||||
, gtk3
|
|
||||||
, desktop-file-utils
|
, desktop-file-utils
|
||||||
, wrapGAppsHook
|
, wrapGAppsHook4
|
||||||
, sixelSupport ? false
|
, sixelSupport ? false
|
||||||
}:
|
}:
|
||||||
|
|
||||||
|
@ -48,6 +47,8 @@ stdenv.mkDerivation rec {
|
||||||
];
|
];
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
substituteInPlace build-aux/meson/postinstall.py \
|
||||||
|
--replace-fail 'gtk-update-icon-cache' 'gtk4-update-icon-cache'
|
||||||
patchShebangs build-aux/meson/postinstall.py
|
patchShebangs build-aux/meson/postinstall.py
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
@ -57,9 +58,8 @@ stdenv.mkDerivation rec {
|
||||||
pkg-config
|
pkg-config
|
||||||
vala
|
vala
|
||||||
sassc
|
sassc
|
||||||
wrapGAppsHook
|
wrapGAppsHook4
|
||||||
python3
|
python3
|
||||||
gtk3 # For gtk-update-icon-cache
|
|
||||||
desktop-file-utils # For update-desktop-database
|
desktop-file-utils # For update-desktop-database
|
||||||
];
|
];
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
, meson
|
, meson
|
||||||
, ninja
|
, ninja
|
||||||
, pkg-config
|
, pkg-config
|
||||||
, wrapGAppsHook
|
, wrapGAppsHook4
|
||||||
, desktop-file-utils
|
, desktop-file-utils
|
||||||
, feedbackd
|
, feedbackd
|
||||||
, gtk4
|
, gtk4
|
||||||
|
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
|
||||||
ninja
|
ninja
|
||||||
phosh
|
phosh
|
||||||
pkg-config
|
pkg-config
|
||||||
wrapGAppsHook
|
wrapGAppsHook4
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
{ appstream-glib
|
{ appstream-glib
|
||||||
, cargo
|
, cargo
|
||||||
|
, dbus
|
||||||
, desktop-file-utils
|
, desktop-file-utils
|
||||||
, fetchFromGitLab
|
, fetchFromGitLab
|
||||||
, git
|
, git
|
||||||
|
@ -16,7 +17,7 @@
|
||||||
, rustPlatform
|
, rustPlatform
|
||||||
, rustc
|
, rustc
|
||||||
, stdenv
|
, stdenv
|
||||||
, wrapGAppsHook
|
, wrapGAppsHook4
|
||||||
}:
|
}:
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "audio-sharing";
|
pname = "audio-sharing";
|
||||||
|
@ -46,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
pkg-config
|
pkg-config
|
||||||
python3
|
python3
|
||||||
rustc
|
rustc
|
||||||
wrapGAppsHook
|
wrapGAppsHook4
|
||||||
] ++ (with rustPlatform; [
|
] ++ (with rustPlatform; [
|
||||||
cargoSetupHook
|
cargoSetupHook
|
||||||
]);
|
]);
|
||||||
|
@ -59,6 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
gst_all_1.gstreamer
|
gst_all_1.gstreamer
|
||||||
gtk4
|
gtk4
|
||||||
libadwaita
|
libadwaita
|
||||||
|
dbus
|
||||||
];
|
];
|
||||||
|
|
||||||
passthru = {
|
passthru = {
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
, python3Packages
|
, python3Packages
|
||||||
, gobject-introspection
|
, gobject-introspection
|
||||||
, libadwaita
|
, libadwaita
|
||||||
, wrapGAppsHook
|
, wrapGAppsHook4
|
||||||
, meson
|
, meson
|
||||||
, ninja
|
, ninja
|
||||||
, desktop-file-utils
|
, desktop-file-utils
|
||||||
|
@ -29,7 +29,7 @@ python3Packages.buildPythonApplication rec {
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
gobject-introspection
|
gobject-introspection
|
||||||
wrapGAppsHook
|
wrapGAppsHook4
|
||||||
desktop-file-utils
|
desktop-file-utils
|
||||||
meson
|
meson
|
||||||
ninja
|
ninja
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
, libfido2
|
, libfido2
|
||||||
, libnotify
|
, libnotify
|
||||||
, python3
|
, python3
|
||||||
, wrapGAppsHook
|
, wrapGAppsHook4
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
|
@ -55,7 +55,7 @@ buildGoModule rec {
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
gobject-introspection
|
gobject-introspection
|
||||||
python3.pkgs.wrapPython
|
python3.pkgs.wrapPython
|
||||||
wrapGAppsHook
|
wrapGAppsHook4
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
, pkg-config
|
, pkg-config
|
||||||
, gettext
|
, gettext
|
||||||
, gobject-introspection
|
, gobject-introspection
|
||||||
, wrapGAppsHook
|
, wrapGAppsHook4
|
||||||
, gjs
|
, gjs
|
||||||
, glib
|
, glib
|
||||||
, gtk4
|
, gtk4
|
||||||
|
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
|
||||||
meson
|
meson
|
||||||
ninja
|
ninja
|
||||||
gobject-introspection
|
gobject-introspection
|
||||||
wrapGAppsHook
|
wrapGAppsHook4
|
||||||
python3
|
python3
|
||||||
desktop-file-utils
|
desktop-file-utils
|
||||||
];
|
];
|
||||||
|
@ -53,6 +53,8 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
chmod +x build-aux/meson_post_install.py
|
chmod +x build-aux/meson_post_install.py
|
||||||
|
substituteInPlace build-aux/meson_post_install.py \
|
||||||
|
--replace-fail 'gtk-update-icon-cache' 'gtk4-update-icon-cache'
|
||||||
patchShebangs build-aux/meson_post_install.py
|
patchShebangs build-aux/meson_post_install.py
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
|
|
@ -62,7 +62,7 @@
|
||||||
, libepoxy
|
, libepoxy
|
||||||
, gnome-user-share
|
, gnome-user-share
|
||||||
, gnome-remote-desktop
|
, gnome-remote-desktop
|
||||||
, wrapGAppsHook
|
, wrapGAppsHook4
|
||||||
, xvfb-run
|
, xvfb-run
|
||||||
}:
|
}:
|
||||||
|
|
||||||
|
@ -93,7 +93,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
pkg-config
|
pkg-config
|
||||||
python3
|
python3
|
||||||
shared-mime-info
|
shared-mime-info
|
||||||
wrapGAppsHook
|
wrapGAppsHook4
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
, atk
|
, atk
|
||||||
, gdk-pixbuf
|
, gdk-pixbuf
|
||||||
, gtk4
|
, gtk4
|
||||||
, wrapGAppsHook
|
, wrapGAppsHook4
|
||||||
}:
|
}:
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
|
@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec {
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
pkg-config
|
pkg-config
|
||||||
wrapGAppsHook
|
wrapGAppsHook4
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{ lib, stdenv, fetchFromGitHub
|
{ lib, stdenv, fetchFromGitHub
|
||||||
, meson, ninja, cmake, pkg-config
|
, meson, ninja, cmake, pkg-config
|
||||||
, liblxi, readline, lua, bash-completion
|
, liblxi, readline, lua, bash-completion
|
||||||
, wrapGAppsHook
|
, wrapGAppsHook4
|
||||||
, glib, gtk4, gtksourceview5, libadwaita, json-glib
|
, glib, gtk4, gtksourceview5, libadwaita, json-glib
|
||||||
, desktop-file-utils, appstream-glib
|
, desktop-file-utils, appstream-glib
|
||||||
, gsettings-desktop-schemas
|
, gsettings-desktop-schemas
|
||||||
|
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
meson ninja cmake pkg-config
|
meson ninja cmake pkg-config
|
||||||
] ++ lib.optional withGui wrapGAppsHook;
|
] ++ lib.optional withGui wrapGAppsHook4;
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
liblxi readline lua bash-completion
|
liblxi readline lua bash-completion
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, blueprint-compiler
|
, blueprint-compiler
|
||||||
, pkg-config
|
, pkg-config
|
||||||
, wrapGAppsHook
|
, wrapGAppsHook4
|
||||||
, gdk-pixbuf
|
, gdk-pixbuf
|
||||||
, gtk4
|
, gtk4
|
||||||
, libdrm
|
, libdrm
|
||||||
|
@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec {
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
blueprint-compiler
|
blueprint-compiler
|
||||||
pkg-config
|
pkg-config
|
||||||
wrapGAppsHook
|
wrapGAppsHook4
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
|
|
Loading…
Reference in a new issue