public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gnome3.gnome-documents: Fix build

Browse Source 
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.
This commit is contained in:
Doron Behar 2020-10-02 14:18:23 +03:00 committed by Jan Tojnar
parent 7f15532486
commit 7e359f1ef1
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
View File

@ -3,6 +3,7 @@
, ninja , ninja
, gettext , gettext
, fetchurl , fetchurl
, fetchpatch
, evince , evince
, gjs , gjs
, pkgconfig , pkgconfig
@ -28,6 +29,7 @@
, desktop-file-utils , desktop-file-utils
, wrapGAppsHook , wrapGAppsHook
, python3 , python3
, appstream-glib
, gsettings-desktop-schemas , gsettings-desktop-schemas
}: }:
@ -40,6 +42,14 @@ stdenv.mkDerivation rec {
sha256 = "1qph567mapg3s1a26k7b8y57g9bklhj2mh8xm758z9zkms20xafq"; sha256 = "1qph567mapg3s1a26k7b8y57g9bklhj2mh8xm758z9zkms20xafq";
}; };
patches = [
# Fix inkscape 1.0 usage
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gnome-documents/commit/0f55a18c40a61e6ae4ec4652604775f139892350.diff";
sha256 = "1yrisq69dl1dn7639drlbza20a5ic6xg04ksr9iq4sxdx3xj3d8s";
})
];
nativeBuildInputs = [ nativeBuildInputs = [
meson meson
ninja ninja
@ -52,6 +62,7 @@ stdenv.mkDerivation rec {
docbook_xml_dtd_42 docbook_xml_dtd_42
wrapGAppsHook wrapGAppsHook
python3 python3
appstream-glib
# building getting started # building getting started
inkscape inkscape
@ -92,6 +103,12 @@ stdenv.mkDerivation rec {
substituteInPlace $out/bin/gnome-documents --replace gapplication "${glib.bin}/bin/gapplication" 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 = { passthru = {
updateScript = gnome3.updateScript { updateScript = gnome3.updateScript {
packageName = pname; packageName = pname;