diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2018-07-06 00:44:49 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2018-07-06 09:35:02 +0200 |
| commit | 18b79b8fcbebe9fcbb8d4a50776924ee23becf39 (patch) | |
| tree | 30bef9b46a63ce877375fbfe3c46e132ce283983 /pkgs/desktops/gnome-3/apps | |
| parent | 8abddf8373db956962a96dc2894239f58ff33915 (diff) | |
| download | nixlib-18b79b8fcbebe9fcbb8d4a50776924ee23becf39.tar nixlib-18b79b8fcbebe9fcbb8d4a50776924ee23becf39.tar.gz nixlib-18b79b8fcbebe9fcbb8d4a50776924ee23becf39.tar.bz2 nixlib-18b79b8fcbebe9fcbb8d4a50776924ee23becf39.tar.lz nixlib-18b79b8fcbebe9fcbb8d4a50776924ee23becf39.tar.xz nixlib-18b79b8fcbebe9fcbb8d4a50776924ee23becf39.tar.zst nixlib-18b79b8fcbebe9fcbb8d4a50776924ee23becf39.zip | |
gnome3.gnome-logs: 3.28.2 → 3.28.3
Diffstat (limited to 'pkgs/desktops/gnome-3/apps')
| -rw-r--r-- | pkgs/desktops/gnome-3/apps/gnome-logs/default.nix | 41 |
1 files changed, 34 insertions, 7 deletions
diff --git a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix index 614308f7b631..ae2b0f29f980 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix @@ -1,19 +1,46 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, gettext, itstool, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_43, systemd }: +{ stdenv, fetchurl, fetchpatch, meson, ninja, pkgconfig, gnome3, glib, gtk3, wrapGAppsHook, desktop-file-utils +, gettext, itstool, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_43, systemd, python3 }: stdenv.mkDerivation rec { name = "gnome-logs-${version}"; - version = "3.28.2"; + version = "3.28.3"; src = fetchurl { url = "mirror://gnome/sources/gnome-logs/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "0qqmw55rrxdz2n9xwn85nm7j9y9i85fxlxjfgv683mbpdyv0gbg0"; + sha256 = "1bpg8172f16sgbhsn2sis3xh2ylrv8vj7j12xdxkmsmfh2k2bqfy"; }; - configureFlags = [ "--disable-tests" ]; + patches = [ + # Fix post_install script + (fetchpatch { + url = https://gitlab.gnome.org/GNOME/gnome-logs/commit/2f498464ac539fdf98199294bfb9205436b9c323.patch; + sha256 = "1v6d8zgd31waliwlvk5xlfjap5h84bpqb1az0wdjm4c2a53iiwlp"; + }) + # Fix a typo in manpage generation + (fetchpatch { + url = https://gitlab.gnome.org/GNOME/gnome-logs/commit/02b782fcd64d4773e2dadbdb9ea74bf3923003b3.patch; + sha256 = "1a8zcp62shspw45s0dvi2iv83qppz4hcw31id6zlwq0dp94vvb46"; + }) + ]; - nativeBuildInputs = [ pkgconfig wrapGAppsHook gettext itstool libxml2 libxslt docbook_xsl docbook_xml_dtd_43 ]; - buildInputs = [ gtk3 systemd gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme ]; + mesonFlags = [ + "-Dtests=true" + "-Dman=true" + ]; + + nativeBuildInputs = [ + (python3.withPackages (pkgs: with pkgs; [ dogtail ])) + meson ninja pkgconfig wrapGAppsHook gettext itstool desktop-file-utils + libxml2 libxslt docbook_xsl docbook_xml_dtd_43 + ]; + buildInputs = [ glib gtk3 systemd gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme ]; + + postPatch = '' + chmod +x meson_post_install.py + patchShebangs meson_post_install.py + ''; + + doCheck = true; passthru = { updateScript = gnome3.updateScript { |