diff options
author | Vladimír Čunát <v@cunat.cz> | 2019-06-23 09:16:14 +0200 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2019-06-23 09:16:14 +0200 |
commit | 772d2d03f9ea6f09df16ea11e27366f11ac47fbd (patch) | |
tree | fb8d77ed8eca82710e7aac046e84a007ee8c9401 /pkgs/applications | |
parent | 7d07263f750543304466ad0c92cdf3606acc7d8d (diff) | |
parent | 12bdb0dc3f3fca256c3874246b7e0d0da6dafad5 (diff) | |
download | nixlib-772d2d03f9ea6f09df16ea11e27366f11ac47fbd.tar nixlib-772d2d03f9ea6f09df16ea11e27366f11ac47fbd.tar.gz nixlib-772d2d03f9ea6f09df16ea11e27366f11ac47fbd.tar.bz2 nixlib-772d2d03f9ea6f09df16ea11e27366f11ac47fbd.tar.lz nixlib-772d2d03f9ea6f09df16ea11e27366f11ac47fbd.tar.xz nixlib-772d2d03f9ea6f09df16ea11e27366f11ac47fbd.tar.zst nixlib-772d2d03f9ea6f09df16ea11e27366f11ac47fbd.zip |
Merge #63555: gnumeric: fix darwin build by upstream patch
Diffstat (limited to 'pkgs/applications')
-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 5845536e72ed..70d1e3d79ba5 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 = [ |