diff options
| author | Eric Wolf <ericwolf42@gmail.com> | 2018-08-25 20:56:21 +0200 |
|---|---|---|
| committer | Eric Wolf <ericwolf42@gmail.com> | 2018-08-26 20:44:39 +0200 |
| commit | 5d91e0f57df0b871b61c42c004607b2df98e7a1f (patch) | |
| tree | cf6f3d1be4a16d4dd0d5eefeca95a7aa7cac517f /pkgs/development/haskell-modules | |
| parent | 64a9aa32ae9a0c73daa64983ea30638bdf244488 (diff) | |
| download | nixlib-5d91e0f57df0b871b61c42c004607b2df98e7a1f.tar nixlib-5d91e0f57df0b871b61c42c004607b2df98e7a1f.tar.gz nixlib-5d91e0f57df0b871b61c42c004607b2df98e7a1f.tar.bz2 nixlib-5d91e0f57df0b871b61c42c004607b2df98e7a1f.tar.lz nixlib-5d91e0f57df0b871b61c42c004607b2df98e7a1f.tar.xz nixlib-5d91e0f57df0b871b61c42c004607b2df98e7a1f.tar.zst nixlib-5d91e0f57df0b871b61c42c004607b2df98e7a1f.zip | |
hunspell-hs: fix build
Using pkgconfig like jtojnar suggested. Disables tests as some necessary data files aren't included on hackage.
Diffstat (limited to 'pkgs/development/haskell-modules')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/haskell-modules/patches/hunspell.patch | 30 |
2 files changed, 33 insertions, 0 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 61c2da2b4195..ef55272d6e97 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -672,6 +672,9 @@ self: super: { # https://github.com/bos/bloomfilter/issues/7 bloomfilter = appendPatch super.bloomfilter ./patches/bloomfilter-fix-on-32bit.patch; + # https://github.com/ashutoshrishi/hunspell-hs/pull/3 + hunspell-hs = addPkgconfigDepend (dontCheck (appendPatch super.hunspell-hs ./patches/hunspell.patch)) pkgs.hunspell; + # https://github.com/pxqr/base32-bytestring/issues/4 base32-bytestring = dontCheck super.base32-bytestring; diff --git a/pkgs/development/haskell-modules/patches/hunspell.patch b/pkgs/development/haskell-modules/patches/hunspell.patch new file mode 100644 index 000000000000..cc115029a7ad --- /dev/null +++ b/pkgs/development/haskell-modules/patches/hunspell.patch @@ -0,0 +1,30 @@ +diff -Naur hunspell-hs-0.1.0.0.orig/hunspell-hs.cabal hunspell-hs-0.1.0.0/hunspell-hs.cabal +--- hunspell-hs-0.1.0.0.orig/hunspell-hs.cabal 2018-08-26 20:23:33.053763300 +0200 ++++ hunspell-hs-0.1.0.0/hunspell-hs.cabal 2018-08-26 20:42:05.886074510 +0200 +@@ -37,7 +37,7 @@ + base >=4.7 && <5 + , stm + if os(linux) +- extra-libraries: ++ pkgconfig-depends: + hunspell + if os(darwin) + include-dirs: +@@ -63,7 +63,7 @@ + , hunspell-hs + , stm + if os(linux) +- extra-libraries: ++ pkgconfig-depends: + hunspell + if os(darwin) + include-dirs: +@@ -88,7 +88,7 @@ + , hunspell-hs + , stm + if os(linux) +- extra-libraries: ++ pkgconfig-depends: + hunspell + if os(darwin) + include-dirs: |