diff options
author | Alyssa Ross <hi@alyssa.is> | 2019-09-11 15:24:55 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2019-09-16 22:14:45 +0000 |
commit | 89c4dccbd5f33f71808d4b1baafe619696af1162 (patch) | |
tree | fb1b8d3a2f171164a05d404ab2340cfb1a9d3e21 /nixpkgs/pkgs/development/libraries/enchant | |
parent | 8920a0e4d962a919238bab69ddc607d7f3396f70 (diff) | |
parent | e19054ab3cd5b7cc9a01d0efc71c8fe310541065 (diff) | |
download | nixlib-89c4dccbd5f33f71808d4b1baafe619696af1162.tar nixlib-89c4dccbd5f33f71808d4b1baafe619696af1162.tar.gz nixlib-89c4dccbd5f33f71808d4b1baafe619696af1162.tar.bz2 nixlib-89c4dccbd5f33f71808d4b1baafe619696af1162.tar.lz nixlib-89c4dccbd5f33f71808d4b1baafe619696af1162.tar.xz nixlib-89c4dccbd5f33f71808d4b1baafe619696af1162.tar.zst nixlib-89c4dccbd5f33f71808d4b1baafe619696af1162.zip |
Merge commit 'e19054ab3cd5b7cc9a01d0efc71c8fe310541065'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/enchant')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/enchant/2.x.nix | 42 |
1 files changed, 34 insertions, 8 deletions
diff --git a/nixpkgs/pkgs/development/libraries/enchant/2.x.nix b/nixpkgs/pkgs/development/libraries/enchant/2.x.nix index 3f46390c12ba..92e34145abde 100644 --- a/nixpkgs/pkgs/development/libraries/enchant/2.x.nix +++ b/nixpkgs/pkgs/development/libraries/enchant/2.x.nix @@ -1,24 +1,50 @@ -{ stdenv, fetchurl, aspell, pkgconfig, glib, hunspell, hspell, unittest-cpp }: +{ stdenv +, fetchurl +, aspell +, pkgconfig +, glib +, hunspell +, hspell +, unittest-cpp +}: stdenv.mkDerivation rec { pname = "enchant"; - version = "2.2.4"; + version = "2.2.5"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://github.com/AbiWord/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "1p6a3qmrh8bjzds6x7rg9da0ir44gg804jzkf634h39wsa4vdmpm"; + sha256 = "0r41qjz3104h5raiwlw5ywwybafbxdjz12j1bnq3kq60jlr6d2pf"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib hunspell ]; - checkInputs = [ unittest-cpp ]; - propagatedBuildInputs = [ hspell aspell ]; # libtool puts it to la file + nativeBuildInputs = [ + pkgconfig + ]; + + buildInputs = [ + glib + hunspell + ]; + + checkInputs = [ + unittest-cpp + ]; + + # libtool puts these to .la files + propagatedBuildInputs = [ + hspell + aspell + ]; enableParallelBuilding = true; - doCheck = false; # https://github.com/AbiWord/enchant/issues/219 + doCheck = true; + + configureFlags = [ + "--enable-relocatable" # needed for tests + ]; meta = with stdenv.lib; { description = "Generic spell checking library"; |