Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: efa604c139ae
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d35b77a922e0
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jan 3, 2021

  1. gramps: move intltool from buildInputs to nativeBuildInputs 

    When intltool is in buildInputs, setup.py reports:

    No intltool or version < 0.25.0, build_intl is aborting

which prevents Gramps's desktop and MIME (and AppData) entries from being
generated and installed.  When intltool is moved to nativeBuildInputs, these
files are installed under share/ as expected.
    @khumba @FRidh
    khumba authored and FRidh committed Jan 3, 2021
    Copy the full SHA
    d35b77a View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 pkgs/applications/misc/gramps/default.nix
4 changes: 2 additions & 2 deletions pkgs/applications/misc/gramps/default.nix
View file
Original file line number Diff line number Diff line change
@@ -12,8 +12,8 @@ in buildPythonApplication rec {
version = "5.1.3";
pname = "gramps";

nativeBuildInputs = [ wrapGAppsHook gettext ];
buildInputs = [ intltool gtk3 gobject-introspection pango gexiv2 ]
nativeBuildInputs = [ wrapGAppsHook intltool gettext ];
buildInputs = [ gtk3 gobject-introspection pango gexiv2 ]
# Map support
++ stdenv.lib.optional enableOSM osm-gps-map
# Graphviz support