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: 7d07263f7505
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 772d2d03f9ea
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Jun 23, 2019

  1. gnumeric: fix darwin build by upstream patch

    @vcunat
    vcunat committed Jun 23, 2019
    Copy the full SHA
    12bdb0d View commit details

  2. Merge #63555: gnumeric: fix darwin build by upstream patch

    @vcunat
    vcunat committed Jun 23, 2019
    Copy the full SHA
    772d2d0 View commit details
Showing with 12 additions and 3 deletions.
  1. +12 −3 pkgs/applications/office/gnumeric/default.nix
15 changes: 12 additions & 3 deletions pkgs/applications/office/gnumeric/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,31 @@
{ stdenv, fetchurl, pkgconfig, intltool, perlPackages
, goffice, gnome3, wrapGAppsHook, gtk3, bison, pythonPackages
, itstool
, itstool, autoreconfHook
}:

let
inherit (pythonPackages) python pygobject3;
in stdenv.mkDerivation rec {
pname = "gnumeric";
version = "1.12.45";
version = "1.12.45"; # TODO next release: remove gamma patch and autoreconfHook

src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0c8dl1kvnj3g32qy3s92qpqpqfy0in59cx005gjvvzsflahav61h";
};

patches = stdenv.lib.optional stdenv.isDarwin
# https://gitlab.gnome.org/GNOME/gnumeric/issues/402
(fetchurl {
name = "math-gamma.patch";
url = "https://gitlab.gnome.org/GNOME/gnumeric/uploads/cf8d162bc719de92e97d01cb0ba5b637/ppp";
sha256 = "17wiigs06qc86a1nghwcg3pcnpa28123jblgsxpy3j7drardgnlp";
});

configureFlags = [ "--disable-component" ];

nativeBuildInputs = [ pkgconfig intltool bison itstool wrapGAppsHook ];
nativeBuildInputs = [ pkgconfig intltool bison itstool wrapGAppsHook ]
++ stdenv.lib.optional stdenv.isDarwin autoreconfHook;

# ToDo: optional libgda, introspection?
buildInputs = [