From 5a8a98252612cb1de63d3ce6dec1a488aaeb057c Mon Sep 17 00:00:00 2001 From: joncojonathan Date: Sun, 7 Oct 2018 17:37:59 +0100 Subject: [PATCH 1/2] gramps: add support for recommended packages The GRAMPS readme indicates there are a number of recommended packages (graphviz, ghostscript, PyICU and osm-gps-map which was already supported). These default to true. --- pkgs/applications/misc/gramps/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/gramps/default.nix b/pkgs/applications/misc/gramps/default.nix index b12b84d106d..dd8cdef4df1 100644 --- a/pkgs/applications/misc/gramps/default.nix +++ b/pkgs/applications/misc/gramps/default.nix @@ -1,7 +1,9 @@ { stdenv, fetchFromGitHub, gtk3, pythonPackages, intltool, gnome3, pango, gobjectIntrospection, wrapGAppsHook, # Optional packages: - enableOSM ? true, osm-gps-map + enableOSM ? true, osm-gps-map, + enableGraphviz ? true, graphviz, + enableGhostscript ? true, ghostscript }: let @@ -14,6 +16,11 @@ in buildPythonApplication rec { buildInputs = [ intltool gtk3 gobjectIntrospection pango gnome3.gexiv2 ] # Map support ++ stdenv.lib.optional enableOSM osm-gps-map + # Graphviz support + ++ stdenv.lib.optional enableGraphviz graphviz + # Ghostscript support + ++ stdenv.lib.optional enableGhostscript ghostscript + ; src = fetchFromGitHub { From 2b93aed3ccfddc1516d5d8be35ff171f5fbcd181 Mon Sep 17 00:00:00 2001 From: joncojonathan Date: Sun, 7 Oct 2018 17:46:29 +0100 Subject: [PATCH 2/2] gramps: add joncojonathan to package maintainers --- pkgs/applications/misc/gramps/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/misc/gramps/default.nix b/pkgs/applications/misc/gramps/default.nix index dd8cdef4df1..413679afd21 100644 --- a/pkgs/applications/misc/gramps/default.nix +++ b/pkgs/applications/misc/gramps/default.nix @@ -60,5 +60,6 @@ in buildPythonApplication rec { description = "Genealogy software"; homepage = https://gramps-project.org; license = licenses.gpl2; + maintainers = with maintainers; [ joncojonathan ]; }; }