giara: 0.3 -> 1.0
This commit is contained in:
parent
632ca37b27
commit
a59d23e2b2
|
@ -1,22 +1,24 @@
|
||||||
{ lib
|
{ lib
|
||||||
, fetchFromGitLab
|
, fetchFromGitLab
|
||||||
|
, fetchpatch
|
||||||
, meson
|
, meson
|
||||||
, gobject-introspection
|
, gobject-introspection
|
||||||
, pkg-config
|
, pkg-config
|
||||||
, ninja
|
, ninja
|
||||||
, python3
|
, python3
|
||||||
, wrapGAppsHook
|
, wrapGAppsHook4
|
||||||
, gtk3
|
, gtk4
|
||||||
, gdk-pixbuf
|
, gdk-pixbuf
|
||||||
, webkitgtk
|
, webkitgtk
|
||||||
, gtksourceview4
|
, gtksourceview5
|
||||||
, libhandy
|
|
||||||
, glib-networking
|
, glib-networking
|
||||||
|
, libadwaita
|
||||||
|
, appstream
|
||||||
}:
|
}:
|
||||||
|
|
||||||
python3.pkgs.buildPythonApplication rec {
|
python3.pkgs.buildPythonApplication rec {
|
||||||
pname = "giara";
|
pname = "giara";
|
||||||
version = "0.3";
|
version = "1.0";
|
||||||
|
|
||||||
format = "other";
|
format = "other";
|
||||||
|
|
||||||
|
@ -25,24 +27,25 @@ python3.pkgs.buildPythonApplication rec {
|
||||||
owner = "World";
|
owner = "World";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "004qmkfrgd37axv0b6hfh6v7nx4pvy987k5yv4bmlmkj9sbqm6f9";
|
hash = "sha256-xDIzgr8zYal0r0sASWqiSZANCMC52LrVmLjlnGAd2Mg=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
appstream
|
||||||
meson
|
meson
|
||||||
gobject-introspection
|
gobject-introspection
|
||||||
pkg-config
|
pkg-config
|
||||||
ninja
|
ninja
|
||||||
wrapGAppsHook
|
wrapGAppsHook4
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
gtk3
|
gtk4
|
||||||
gdk-pixbuf
|
gdk-pixbuf
|
||||||
webkitgtk
|
webkitgtk
|
||||||
gtksourceview4
|
gtksourceview5
|
||||||
libhandy
|
|
||||||
glib-networking
|
glib-networking
|
||||||
|
libadwaita
|
||||||
];
|
];
|
||||||
|
|
||||||
pythonPath = with python3.pkgs; [
|
pythonPath = with python3.pkgs; [
|
||||||
|
@ -55,6 +58,21 @@ python3.pkgs.buildPythonApplication rec {
|
||||||
beautifulsoup4
|
beautifulsoup4
|
||||||
];
|
];
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
# Proper support for gtk4 and libadwaita
|
||||||
|
# @TODO: Remove when bumping the version.
|
||||||
|
(fetchpatch {
|
||||||
|
name = "giara-gtk4-libadwaita.patch";
|
||||||
|
url = "https://gitlab.gnome.org/World/giara/-/commit/6204427f8b8e3d8c72b669717a3f129ffae401d9.patch";
|
||||||
|
sha256 = "sha256-E8kbVsACPD2gkfNrzYUy0+1U7+/pIkUu4rCkX+xY0us=";
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
|
postPatch = ''
|
||||||
|
substituteInPlace meson_post_install.py \
|
||||||
|
--replace "gtk-update-icon-cache" "gtk4-update-icon-cache"
|
||||||
|
'';
|
||||||
|
|
||||||
# Fix setup-hooks https://github.com/NixOS/nixpkgs/issues/56943
|
# Fix setup-hooks https://github.com/NixOS/nixpkgs/issues/56943
|
||||||
strictDeps = false;
|
strictDeps = false;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue