Merge pull request #153198 from steamwalker/abiword
abiword: 3.0.4 -> 3.0.5
This commit is contained in:
commit
05134908ad
1 changed files with 2 additions and 16 deletions
|
@ -5,29 +5,15 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "abiword";
|
pname = "abiword";
|
||||||
version = "3.0.4";
|
version = "3.0.5";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://www.abisource.com/downloads/abiword/${version}/source/${pname}-${version}.tar.gz";
|
url = "https://www.abisource.com/downloads/abiword/${version}/source/${pname}-${version}.tar.gz";
|
||||||
sha256 = "1mx5l716n0z5788i19qmad30cck4v9ggr071cafw2nrf375rcc79";
|
hash = "sha256-ElckfplwUI1tFFbT4zDNGQnEtCsl4PChvDJSbW86IbQ=";
|
||||||
};
|
};
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
patches = [
|
|
||||||
# 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://raw.githubusercontent.com/archlinux/svntogit-packages/d3ff951d3c7249927e7113b3de1653031db24596/abiword/trunk/enchant-2.1.patch";
|
|
||||||
sha256 = "444dc2aadea3c80310a509b690097541573f6d2652c573d04da66a0f385fcfb2";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
postPatch = ''
|
|
||||||
substituteInPlace configure --replace 'enchant >=' 'enchant-2 >='
|
|
||||||
'';
|
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config wrapGAppsHook ];
|
nativeBuildInputs = [ pkg-config wrapGAppsHook ];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
|
|
Loading…
Reference in a new issue