Merge pull request #226234 from zendo/upd/wike

This commit is contained in:
Sandro 2023-04-24 21:41:24 +02:00 committed by GitHub
commit 95f82c2fe7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,23 +1,31 @@
{ lib, stdenv, fetchFromGitHub { lib
, meson, pkg-config, ninja , fetchFromGitHub
, python3 , python3
, glib, appstream-glib , desktop-file-utils , meson
, gobject-introspection, gtk3 , ninja
, wrapGAppsHook , pkg-config
, libhandy, webkitgtk, glib-networking , appstream-glib
, gnome, dconf , desktop-file-utils
, gobject-introspection
, wrapGAppsHook4
, glib
, gtk4
, librsvg
, libadwaita
, glib-networking
, webkitgtk_6_0
}: }:
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "wike"; pname = "wike";
version = "1.7.1"; version = "2.0.1";
format = "other"; format = "other";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "hugolabe"; owner = "hugolabe";
repo = "Wike"; repo = "Wike";
rev = version; rev = version;
sha256 = "sha256-QLhfzGRrc2En0Hu+UdtPM572PdtXqOFL0W3LoAki4jI="; hash = "sha256-R8Zg/2tr9MrmtTdbvqD+Ra8+MEBJdgMqC3ptx1VgkeA=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -27,17 +35,16 @@ python3.pkgs.buildPythonApplication rec {
appstream-glib appstream-glib
desktop-file-utils desktop-file-utils
gobject-introspection gobject-introspection
wrapGAppsHook wrapGAppsHook4
]; ];
buildInputs = [ buildInputs = [
glib glib
gtk3 gtk4
libhandy librsvg
webkitgtk libadwaita
glib-networking glib-networking
gnome.adwaita-icon-theme webkitgtk_6_0
dconf
]; ];
propagatedBuildInputs = with python3.pkgs; [ propagatedBuildInputs = with python3.pkgs; [
@ -47,13 +54,21 @@ python3.pkgs.buildPythonApplication rec {
postPatch = '' postPatch = ''
patchShebangs build-aux/meson/postinstall.py patchShebangs build-aux/meson/postinstall.py
substituteInPlace build-aux/meson/postinstall.py \
--replace gtk-update-icon-cache gtk4-update-icon-cache
'';
# prevent double wrapping
dontWrapGApps = true;
preFixup = ''
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
''; '';
meta = with lib; { meta = with lib; {
description = "Wikipedia Reader for the GNOME Desktop"; description = "Wikipedia Reader for the GNOME Desktop";
homepage = "https://github.com/hugolabe/Wike"; homepage = "https://github.com/hugolabe/Wike";
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
platforms = webkitgtk.meta.platforms; platforms = platforms.linux;
maintainers = with maintainers; [ samalws ]; maintainers = with maintainers; [ samalws ];
}; };
} }