abiword: clean up

+9 -13
+9 -12
pkgs/applications/office/abiword/default.nix
··· 1 - { stdenv, fetchurl, pkgconfig, gtk3, libglade, libgnomecanvas, fribidi 1 + { stdenv, fetchurl, pkgconfig, gtk3, fribidi 2 2 , libpng, popt, libgsf, enchant, wv, librsvg, bzip2, libjpeg, perl 3 - , boost, libxslt, goffice, makeWrapper, iconTheme 3 + , boost, libxslt, goffice, wrapGAppsHook, iconTheme 4 4 }: 5 5 6 6 stdenv.mkDerivation rec { ··· 8 8 version = "3.0.2"; 9 9 10 10 src = fetchurl { 11 - url = "http://www.abisource.com/downloads/abiword/${version}/source/${name}.tar.gz"; 11 + url = "https://www.abisource.com/downloads/abiword/${version}/source/${name}.tar.gz"; 12 12 sha256 = "08imry821g81apdwym3gcs4nss0l9j5blqk31j5rv602zmcd9gxg"; 13 13 }; 14 14 ··· 22 22 }) 23 23 ]; 24 24 25 - buildInputs = 26 - [ pkgconfig gtk3 libglade librsvg bzip2 libgnomecanvas fribidi libpng popt 27 - libgsf enchant wv libjpeg perl boost libxslt goffice makeWrapper iconTheme 28 - ]; 25 + nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; 29 26 30 - postFixup = '' 31 - wrapProgram "$out/bin/abiword" \ 32 - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" 33 - ''; 27 + buildInputs = [ 28 + gtk3 librsvg bzip2 fribidi libpng popt 29 + libgsf enchant wv libjpeg perl boost libxslt goffice iconTheme 30 + ]; 34 31 35 32 meta = with stdenv.lib; { 36 33 description = "Word processing program, similar to Microsoft Word"; 37 - homepage = http://www.abisource.com/; 34 + homepage = https://www.abisource.com/; 38 35 license = licenses.gpl3; 39 36 platforms = platforms.linux; 40 37 maintainers = with maintainers; [ pSub ylwghst ];
-1
pkgs/top-level/all-packages.nix
··· 14648 14648 }; 14649 14649 14650 14650 abiword = callPackage ../applications/office/abiword { 14651 - inherit (gnome2) libglade libgnomecanvas; 14652 14651 iconTheme = gnome3.defaultIconTheme; 14653 14652 }; 14654 14653