gnumeric: switch to gitlab sources, fix build
- switch to gitlab sources to avoid bad pre-baked autotools artifacts
- run autogen.sh to refresh po-functions/Makefile.in.in with correct intltool
- supply build dependencies that were previously unnecessary
due to using pre-baked autotools artifacts
- remove `with lib;` from meta
This commit is contained in:
@@ -2,8 +2,6 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
autoconf,
|
||||
automake,
|
||||
pkg-config,
|
||||
intltool,
|
||||
libxml2,
|
||||
@@ -17,6 +15,11 @@
|
||||
bison,
|
||||
python3Packages,
|
||||
itstool,
|
||||
autoreconfHook,
|
||||
gtk-doc,
|
||||
fetchFromGitLab,
|
||||
gettext,
|
||||
yelp-tools,
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -26,16 +29,25 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gnumeric";
|
||||
version = "1.12.59";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnumeric/${lib.versions.majorMinor finalAttrs.version}/gnumeric-${finalAttrs.version}.tar.xz";
|
||||
sha256 = "yzdQsXbWQflCPfchuDFljIKVV1UviIf+34pT2Qfs61E=";
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "GNOME";
|
||||
repo = "gnumeric";
|
||||
tag = "GNUMERIC_${lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version}";
|
||||
hash = "sha256-7xCDOqPx3QLDHLoKG46e8te4smSFrLOgCcWkiJXGjDQ=";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
./autogen.sh
|
||||
'';
|
||||
|
||||
configureFlags = [ "--disable-component" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoconf
|
||||
automake
|
||||
autoreconfHook
|
||||
gettext
|
||||
gtk-doc
|
||||
yelp-tools
|
||||
pkg-config
|
||||
intltool
|
||||
bison
|
||||
@@ -74,11 +86,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "GNOME Office Spreadsheet";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
homepage = "http://projects.gnome.org/gnumeric/";
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.vcunat ];
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = [ lib.maintainers.vcunat ];
|
||||
};
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user