diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-04-14 17:50:16 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-04-14 17:50:16 +0000 |
| commit | 439ebf093f2779d73bc76484a36be2889cc807bf (patch) | |
| tree | 7dd3b84fb345c228165c2dae6c7cdd54b433db9e /nixpkgs/pkgs/development/libraries/nuspell | |
| parent | d7417c2c1096b13fe903af802c7cf019fca14a7b (diff) | |
| parent | 0c0954781e257b8b0dc49341795a2fe7d96945a3 (diff) | |
| download | nixlib-439ebf093f2779d73bc76484a36be2889cc807bf.tar nixlib-439ebf093f2779d73bc76484a36be2889cc807bf.tar.gz nixlib-439ebf093f2779d73bc76484a36be2889cc807bf.tar.bz2 nixlib-439ebf093f2779d73bc76484a36be2889cc807bf.tar.lz nixlib-439ebf093f2779d73bc76484a36be2889cc807bf.tar.xz nixlib-439ebf093f2779d73bc76484a36be2889cc807bf.tar.zst nixlib-439ebf093f2779d73bc76484a36be2889cc807bf.zip | |
Merge commit '0c0954781e257b8b0dc49341795a2fe7d96945a3'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/nuspell')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/nuspell/default.nix | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/nixpkgs/pkgs/development/libraries/nuspell/default.nix b/nixpkgs/pkgs/development/libraries/nuspell/default.nix index 1d92a15ce005..b667dea8d49f 100644 --- a/nixpkgs/pkgs/development/libraries/nuspell/default.nix +++ b/nixpkgs/pkgs/development/libraries/nuspell/default.nix @@ -1,23 +1,24 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, boost, icu, catch2 }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, icu, catch2 }: stdenv.mkDerivation rec { name = "nuspell-${version}"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "nuspell"; repo = "nuspell"; rev = "v${version}"; - sha256 = "0gcw3p1agnx474r7kv27y9jyab20p4j4xx7j9a2yssg54qabm71j"; + sha256 = "17khkb1sxn1p6rfql72l7a4lxafbxj0dwi95hsmyi6wajvfrg9sy"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ boost icu ]; enableParallelBuilding = true; - preBuild = '' - ln -s ${catch2}/include/catch2/*.hpp tests/ + postPatch = '' + rm -rf external/Catch2 + ln -sf ${catch2.src} external/Catch2 ''; meta = with stdenv.lib; { |