diff options
| author | Vladimír Čunát <v@cunat.cz> | 2019-06-20 07:43:21 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-06-23 09:13:46 +0200 |
| commit | 12bdb0dc3f3fca256c3874246b7e0d0da6dafad5 (patch) | |
| tree | b017e5ceefd5513e11dfabb9dadde13e2cb84b24 /pkgs/applications/office | |
| parent | 2f6023bf8a5942092aa0675efd5a10974dfce800 (diff) | |
| download | nixpkgs-12bdb0dc3f3fca256c3874246b7e0d0da6dafad5.tar nixpkgs-12bdb0dc3f3fca256c3874246b7e0d0da6dafad5.tar.gz nixpkgs-12bdb0dc3f3fca256c3874246b7e0d0da6dafad5.tar.bz2 nixpkgs-12bdb0dc3f3fca256c3874246b7e0d0da6dafad5.tar.lz nixpkgs-12bdb0dc3f3fca256c3874246b7e0d0da6dafad5.tar.xz nixpkgs-12bdb0dc3f3fca256c3874246b7e0d0da6dafad5.tar.zst nixpkgs-12bdb0dc3f3fca256c3874246b7e0d0da6dafad5.zip | |
gnumeric: fix darwin build by upstream patch
Diffstat (limited to 'pkgs/applications/office')
| -rw-r--r-- | pkgs/applications/office/gnumeric/default.nix | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix index 5845536e72e..70d1e3d79ba 100644 --- a/pkgs/applications/office/gnumeric/default.nix +++ b/pkgs/applications/office/gnumeric/default.nix @@ -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 = [ |