From 7e359f1ef1b9fb04caf759e6d9f9a48f40e4e820 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Fri, 2 Oct 2020 14:18:23 +0300 Subject: [PATCH] gnome3.gnome-documents: Fix build Add appstream-glib to native build inputs, for appstream-util. Add patch for inkscape 1.0 CLI arguments. Silence an inkscape warning regarding profile directory. --- .../gnome-3/apps/gnome-documents/default.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix index 2983e0adca4..7b0c6f0ac2f 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix @@ -3,6 +3,7 @@ , ninja , gettext , fetchurl +, fetchpatch , evince , gjs , pkgconfig @@ -28,6 +29,7 @@ , desktop-file-utils , wrapGAppsHook , python3 +, appstream-glib , gsettings-desktop-schemas }: @@ -40,6 +42,14 @@ stdenv.mkDerivation rec { sha256 = "1qph567mapg3s1a26k7b8y57g9bklhj2mh8xm758z9zkms20xafq"; }; + patches = [ + # Fix inkscape 1.0 usage + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-documents/commit/0f55a18c40a61e6ae4ec4652604775f139892350.diff"; + sha256 = "1yrisq69dl1dn7639drlbza20a5ic6xg04ksr9iq4sxdx3xj3d8s"; + }) + ]; + nativeBuildInputs = [ meson ninja @@ -52,6 +62,7 @@ stdenv.mkDerivation rec { docbook_xml_dtd_42 wrapGAppsHook python3 + appstream-glib # building getting started inkscape @@ -92,6 +103,12 @@ stdenv.mkDerivation rec { substituteInPlace $out/bin/gnome-documents --replace gapplication "${glib.bin}/bin/gapplication" ''; + preConfigure = + # To silence inkscape warnings regarding profile directory + '' + export INKSCAPE_PROFILE_DIR="$(mktemp -d)" + ''; + passthru = { updateScript = gnome3.updateScript { packageName = pname;