Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

abiword: 3.0.2 -> 3.0.4 #82553

Merged
merged 1 commit into from Mar 14, 2020
Merged

abiword: 3.0.2 -> 3.0.4 #82553

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 12 additions & 6 deletions pkgs/applications/office/abiword/default.nix
View file
Open in desktop
Expand Up @@ -5,23 +5,29 @@

stdenv.mkDerivation rec {
pname = "abiword";
version = "3.0.2";
version = "3.0.4";

src = fetchurl {
url = "https://www.abisource.com/downloads/abiword/${version}/source/${pname}-${version}.tar.gz";
sha256 = "08imry821g81apdwym3gcs4nss0l9j5blqk31j5rv602zmcd9gxg";
sha256 = "1mx5l716n0z5788i19qmad30cck4v9ggr071cafw2nrf375rcc79";
};

enableParallelBuilding = true;

patches = [
# https://bugzilla.abisource.com/show_bug.cgi?id=13791
# Switch to using enchant2; note by the next update enchant2 should be
# default and this patch can be removed.
# https://github.com/NixOS/nixpkgs/issues/38506
(fetchurl {
url = https://bugzilla.abisource.com/attachment.cgi?id=5860;
sha256 = "02p8kz02xm1197zcpzjs010mna9hxsbq5lwgxr8b7qhh9yxja7al";
url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/enchant-2.1.patch?h=packages/abiword";
sha256 = "444dc2aadea3c80310a509b690097541573f6d2652c573d04da66a0f385fcfb2";
})
];

postPatch = ''
substituteInPlace configure --replace 'enchant >=' 'enchant-2 >='
'';

nativeBuildInputs = [ pkgconfig wrapGAppsHook ];

buildInputs = [
Expand All @@ -34,6 +40,6 @@ stdenv.mkDerivation rec {
homepage = https://www.abisource.com/;
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = with maintainers; [ pSub ylwghst ];
maintainers = with maintainers; [ pSub ylwghst sna ];
};
}