abiword: clean up

This commit is contained in:
Jan Tojnar 2018-03-29 10:25:32 +02:00
parent 97f93789a9
commit e54342d47e
No known key found for this signature in database
GPG key ID: 7FAB2A15F7A607A4
2 changed files with 9 additions and 13 deletions

View file

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, gtk3, libglade, libgnomecanvas, fribidi
{ stdenv, fetchurl, pkgconfig, gtk3, fribidi
, libpng, popt, libgsf, enchant, wv, librsvg, bzip2, libjpeg, perl
, boost, libxslt, goffice, makeWrapper, iconTheme
, boost, libxslt, goffice, wrapGAppsHook, iconTheme
}:
stdenv.mkDerivation rec {
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
version = "3.0.2";
src = fetchurl {
url = "http://www.abisource.com/downloads/abiword/${version}/source/${name}.tar.gz";
url = "https://www.abisource.com/downloads/abiword/${version}/source/${name}.tar.gz";
sha256 = "08imry821g81apdwym3gcs4nss0l9j5blqk31j5rv602zmcd9gxg";
};
@ -22,19 +22,16 @@ stdenv.mkDerivation rec {
})
];
buildInputs =
[ pkgconfig gtk3 libglade librsvg bzip2 libgnomecanvas fribidi libpng popt
libgsf enchant wv libjpeg perl boost libxslt goffice makeWrapper iconTheme
];
nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
postFixup = ''
wrapProgram "$out/bin/abiword" \
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
'';
buildInputs = [
gtk3 librsvg bzip2 fribidi libpng popt
libgsf enchant wv libjpeg perl boost libxslt goffice iconTheme
];
meta = with stdenv.lib; {
description = "Word processing program, similar to Microsoft Word";
homepage = http://www.abisource.com/;
homepage = https://www.abisource.com/;
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = with maintainers; [ pSub ylwghst ];

View file

@ -14648,7 +14648,6 @@ with pkgs;
};
abiword = callPackage ../applications/office/abiword {
inherit (gnome2) libglade libgnomecanvas;
iconTheme = gnome3.defaultIconTheme;
};