diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/misc/gramps')
3 files changed, 66 insertions, 47 deletions
diff --git a/nixpkgs/pkgs/applications/misc/gramps/check-locale-hasattr-textdomain.patch b/nixpkgs/pkgs/applications/misc/gramps/check-locale-hasattr-textdomain.patch new file mode 100644 index 000000000000..e1573ba5de33 --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/gramps/check-locale-hasattr-textdomain.patch @@ -0,0 +1,19 @@ +diff --git a/gramps/gen/utils/grampslocale.py b/gramps/gen/utils/grampslocale.py +index f25030e..59c1c90 100644 +--- a/gramps/gen/utils/grampslocale.py ++++ b/gramps/gen/utils/grampslocale.py +@@ -370,8 +370,12 @@ class GrampsLocale: + ) + else: + # bug12278, _build_popup_ui() under linux and macOS +- locale.textdomain(self.localedomain) +- locale.bindtextdomain(self.localedomain, self.localedir) ++ if hasattr(locale, 'textdomain'): ++ locale.textdomain(self.localedomain) ++ locale.bindtextdomain(self.localedomain, self.localedir) ++ else: ++ gettext.textdomain(self.localedomain) ++ gettext.bindtextdomain(self.localedomain, self.localedir) + + self.rtl_locale = False + if self.language[0] in _RTL_LOCALES: diff --git a/nixpkgs/pkgs/applications/misc/gramps/default.nix b/nixpkgs/pkgs/applications/misc/gramps/default.nix index bd0690b381a9..a24cff0942e1 100644 --- a/nixpkgs/pkgs/applications/misc/gramps/default.nix +++ b/nixpkgs/pkgs/applications/misc/gramps/default.nix @@ -1,5 +1,4 @@ { lib -, fetchpatch , fetchFromGitHub , gtk3 , pythonPackages @@ -10,8 +9,8 @@ , gobject-introspection , wrapGAppsHook , gettext -, # Optional packages: - enableOSM ? true + # Optional packages: +, enableOSM ? true , osm-gps-map , glib-networking , enableGraphviz ? true @@ -21,13 +20,29 @@ }: let - inherit (pythonPackages) python buildPythonApplication; + inherit (pythonPackages) buildPythonApplication pythonOlder; in buildPythonApplication rec { - version = "5.1.6"; + version = "5.2.0"; pname = "gramps"; pyproject = true; + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "gramps-project"; + repo = "gramps"; + rev = "v${version}"; + hash = "sha256-8iQcaWLiBegVjcV16TfZbp8/4N/9f5pEl7mdV78CeEY="; + }; + + patches = [ + # textdomain doesn't exist as a property on locale when running on Darwin + ./check-locale-hasattr-textdomain.patch + # disables the startup warning about bad GTK installation + ./disable-gtk-warning-dialog.patch + ]; + nativeBuildInputs = [ wrapGAppsHook intltool @@ -38,6 +53,7 @@ buildPythonApplication rec { nativeCheckInputs = [ glibcLocales + pythonPackages.unittestCheckHook pythonPackages.jsonschema pythonPackages.mock pythonPackages.lxml @@ -52,55 +68,25 @@ buildPythonApplication rec { ++ lib.optional enableGhostscript ghostscript ; - src = fetchFromGitHub { - owner = "gramps-project"; - repo = "gramps"; - rev = "v${version}"; - hash = "sha256-BerkDXdFYfZ3rV5AeMo/uk53IN2U5z4GFs757Ar26v0="; - }; - - pythonPath = with pythonPackages; [ + propagatedBuildInputs = with pythonPackages; [ bsddb3 pyicu pygobject3 pycairo ]; - patches = [ - # fix for running tests with a temporary home - remove next release - # https://gramps-project.org/bugs/view.php?id=12577 - (fetchpatch { - url = "https://github.com/gramps-project/gramps/commit/1e95d8a6b5193d655d8caec1e6ab13628ad123db.patch"; - hash = "sha256-2riWB13Yl+tk9+Tuo0YDLoxY2Rc0xrJKfb+ZU7Puzxk="; - }) - ]; - - # Same installPhase as in buildPythonApplication but without --old-and-unmanageble - # install flag. - installPhase = '' - runHook preInstall - - mkdir -p "$out/${python.sitePackages}" - - export PYTHONPATH="$out/${python.sitePackages}:$PYTHONPATH" - ${python}/bin/${python.executable} setup.py install \ - --install-lib=$out/${python.sitePackages} \ - --prefix="$out" - - eapth="$out/${python.sitePackages}/easy-install.pth" - if [ -e "$eapth" ]; then - # move colliding easy_install.pth to specifically named one - mv "$eapth" $(dirname "$eapth")/${pname}-${version}.pth - fi - - rm -f "$out/${python.sitePackages}"/site.py* - - runHook postInstall + preCheck = '' + export HOME=$(mktemp -d) + mkdir .git # Make gramps think that it's not in an installed state ''; - preCheck = '' - export HOME=$TMPDIR + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=( + "''${gappsWrapperArgs[@]}" + ) ''; # https://github.com/NixOS/nixpkgs/issues/149812 @@ -111,8 +97,8 @@ buildPythonApplication rec { description = "Genealogy software"; mainProgram = "gramps"; homepage = "https://gramps-project.org"; - maintainers = with maintainers; [ jk pinpox ]; - changelog = "https://github.com/gramps-project/gramps/blob/v${version}/ChangeLog"; + maintainers = with maintainers; [ jk pinpox tomasajt ]; + changelog = "https://github.com/gramps-project/gramps/blob/${src.rev}/ChangeLog"; longDescription = '' Every person has their own story but they are also part of a collective family history. Gramps gives you the ability to record the many details of diff --git a/nixpkgs/pkgs/applications/misc/gramps/disable-gtk-warning-dialog.patch b/nixpkgs/pkgs/applications/misc/gramps/disable-gtk-warning-dialog.patch new file mode 100644 index 000000000000..c97fe9dde9f4 --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/gramps/disable-gtk-warning-dialog.patch @@ -0,0 +1,14 @@ +diff --git a/gramps/gui/grampsgui.py b/gramps/gui/grampsgui.py +index 0c0d4c3..522f65a 100644 +--- a/gramps/gui/grampsgui.py ++++ b/gramps/gui/grampsgui.py +@@ -573,9 +573,6 @@ class Gramps: + dbstate = DbState() + self._vm = ViewManager(app, dbstate, config.get("interface.view-categories")) + +- if lin() and glocale.lang != "C" and not gettext.find(GTK_GETTEXT_DOMAIN): +- _display_gtk_gettext_message(parent=self._vm.window) +- + _display_translator_message(parent=self._vm.window) + + self._vm.init_interface() |