Merge pull request #166254 from bobby285271/gnome-logs
This commit is contained in:
commit
a08c0e60a8
|
@ -117,6 +117,7 @@ with lib.maintainers; {
|
||||||
|
|
||||||
gnome = {
|
gnome = {
|
||||||
members = [
|
members = [
|
||||||
|
bobby285271
|
||||||
hedning
|
hedning
|
||||||
jtojnar
|
jtojnar
|
||||||
dasj19
|
dasj19
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{ lib, stdenv
|
{ stdenv
|
||||||
|
, lib
|
||||||
, fetchurl
|
, fetchurl
|
||||||
, fetchpatch
|
|
||||||
, meson
|
, meson
|
||||||
, ninja
|
, ninja
|
||||||
, pkg-config
|
, pkg-config
|
||||||
|
@ -10,6 +10,7 @@
|
||||||
, wrapGAppsHook
|
, wrapGAppsHook
|
||||||
, gettext
|
, gettext
|
||||||
, itstool
|
, itstool
|
||||||
|
, libhandy
|
||||||
, libxml2
|
, libxml2
|
||||||
, libxslt
|
, libxslt
|
||||||
, docbook_xsl
|
, docbook_xsl
|
||||||
|
@ -21,21 +22,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "gnome-logs";
|
pname = "gnome-logs";
|
||||||
version = "3.36.0";
|
version = "42.0";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://gnome/sources/gnome-logs/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
url = "mirror://gnome/sources/gnome-logs/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||||
sha256 = "0w1nfdxbv3f0wnhmdy21ydvr4swfc108hypda561p7l9lrhnnxj4";
|
sha256 = "TV5FFp1r9DkC16npoHk8kW65LaumuoWzXI629nLNq9c=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
|
||||||
# https://gitlab.gnome.org/GNOME/gnome-logs/-/issues/52
|
|
||||||
(fetchpatch {
|
|
||||||
url = "https://gitlab.gnome.org/GNOME/gnome-logs/-/commit/b42defceefc775220b525f665a3b662ab9593b81.patch";
|
|
||||||
sha256 = "1s0zscmhwy7r0xff17wh8ik8x9xw1vrkipw5vl5i770bxnljps8n";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
python3
|
python3
|
||||||
meson
|
meson
|
||||||
|
@ -53,9 +46,9 @@ stdenv.mkDerivation rec {
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
glib
|
glib
|
||||||
gtk3
|
gtk3
|
||||||
|
libhandy
|
||||||
systemd
|
systemd
|
||||||
gsettings-desktop-schemas
|
gsettings-desktop-schemas
|
||||||
gnome.adwaita-icon-theme
|
|
||||||
];
|
];
|
||||||
|
|
||||||
mesonFlags = [
|
mesonFlags = [
|
||||||
|
@ -80,7 +73,7 @@ stdenv.mkDerivation rec {
|
||||||
homepage = "https://wiki.gnome.org/Apps/Logs";
|
homepage = "https://wiki.gnome.org/Apps/Logs";
|
||||||
description = "A log viewer for the systemd journal";
|
description = "A log viewer for the systemd journal";
|
||||||
maintainers = teams.gnome.members;
|
maintainers = teams.gnome.members;
|
||||||
license = licenses.gpl3;
|
license = licenses.gpl3Plus;
|
||||||
platforms = platforms.linux;
|
platforms = platforms.linux;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue