diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2022-02-16 18:34:26 +0000 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2022-03-25 15:01:24 +0100 |
commit | be6dd33ba456a1f8bfa58dbe9cdae7f9b0fa7688 (patch) | |
tree | 751a44c9282848c74bd7df8e406d6271e2981cd0 /pkgs/desktops/gnome/apps/gnome-characters | |
parent | 2781e6a32b8e2e175be81f4800b512128483a516 (diff) |
gnome.gnome-characters: 41.0 → 42.beta
https://gitlab.gnome.org/GNOME/gnome-characters/-/compare/41.0...42.beta Background service was merged into the main executable https://gitlab.gnome.org/GNOME/gnome-characters/-/merge_requests/68
Diffstat (limited to 'pkgs/desktops/gnome/apps/gnome-characters')
-rw-r--r-- | pkgs/desktops/gnome/apps/gnome-characters/default.nix | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/pkgs/desktops/gnome/apps/gnome-characters/default.nix b/pkgs/desktops/gnome/apps/gnome-characters/default.nix index 960a3320472d7..48254c22a7142 100644 --- a/pkgs/desktops/gnome/apps/gnome-characters/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-characters/default.nix @@ -7,26 +7,26 @@ , gettext , gnome , glib -, gtk3 +, gtk4 , pango -, wrapGAppsHook +, wrapGAppsHook4 , python3 +, desktop-file-utils , gobject-introspection , gjs , libunistring -, libhandy +, libadwaita , gsettings-desktop-schemas -, adwaita-icon-theme , gnome-desktop }: stdenv.mkDerivation rec { pname = "gnome-characters"; - version = "41.0"; + version = "42.beta"; src = fetchurl { url = "mirror://gnome/sources/gnome-characters/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "0yw6mimfwn0fij8zncjb4rg8bnazd1z47rmzq85lk6807nlyqag1"; + sha256 = "ytMfo5JAI1hhi+aY9GeQmyF1Sp//9Mq4hSPwmiwqGxI="; }; nativeBuildInputs = [ @@ -36,39 +36,39 @@ stdenv.mkDerivation rec { ninja pkg-config python3 - wrapGAppsHook + desktop-file-utils + wrapGAppsHook4 ]; buildInputs = [ - adwaita-icon-theme gjs glib gnome-desktop # for typelib gsettings-desktop-schemas - gtk3 + gtk4 libunistring - libhandy + libadwaita pango ]; postPatch = '' chmod +x meson_post_install.py # patchShebangs requires executable file patchShebangs meson_post_install.py + + # https://gitlab.gnome.org/GNOME/gnome-characters/-/merge_requests/70 + substituteInPlace meson_post_install.py \ + --replace "gtk-update-icon-cache" "gtk4-update-icon-cache" ''; dontWrapGApps = true; - # Fixes https://github.com/NixOS/nixpkgs/issues/31168 postFixup = '' - for file in $out/share/org.gnome.Characters/org.gnome.Characters \ - $out/share/org.gnome.Characters/org.gnome.Characters.BackgroundService - do - sed -e $"2iimports.package._findEffectiveEntryPointName = () => \'$(basename $file)\' " \ - -i $file - - wrapGApp "$file" - done + # Fixes https://github.com/NixOS/nixpkgs/issues/31168 + file="$out/share/org.gnome.Characters/org.gnome.Characters" + sed -e $"2iimports.package._findEffectiveEntryPointName = () => \'$(basename $file)\' " \ + -i $file + wrapGApp "$file" ''; passthru = { |