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

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

Browse Source
This commit is contained in:
Vladimír Čunát 2019-06-23 09:16:14 +02:00
commit 772d2d03f9
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/applications/office/gnumeric/default.nix
View File

@ -1,22 +1,31 @@
{ stdenv, fetchurl, pkgconfig, intltool, perlPackages { stdenv, fetchurl, pkgconfig, intltool, perlPackages
, goffice, gnome3, wrapGAppsHook, gtk3, bison, pythonPackages , goffice, gnome3, wrapGAppsHook, gtk3, bison, pythonPackages
, itstool , itstool, autoreconfHook
}: }:
let let
inherit (pythonPackages) python pygobject3; inherit (pythonPackages) python pygobject3;
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "gnumeric"; pname = "gnumeric";
version = "1.12.45"; version = "1.12.45"; # TODO next release: remove gamma patch and autoreconfHook
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0c8dl1kvnj3g32qy3s92qpqpqfy0in59cx005gjvvzsflahav61h"; 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" ]; 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? # ToDo: optional libgda, introspection?
buildInputs = [ buildInputs = [