cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #78341 from riannucci/patch-1

Browse source 
pyenchant: Fix for darwin/macOS
This commit is contained in:
Jan Tojnar 2020-01-31 02:37:44 +01:00 committed by GitHub
commit 29d8a1c3f6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
pkgs/development/python-modules/pyenchant/default.nix
View file

@ -1,7 +1,7 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, pkgs
, enchant2
}:
buildPythonPackage rec {
@ -13,15 +13,21 @@ buildPythonPackage rec {
sha256 = "fc31cda72ace001da8fe5d42f11c26e514a91fa8c70468739216ddd8de64e2a0";
};
propagatedBuildInputs = [ pkgs.enchant1 ];
propagatedBuildInputs = [ enchant2 ];
patchPhase = let
path_hack_script = "s|LoadLibrary(e_path)|LoadLibrary('${pkgs.enchant1}/lib/' + e_path)|";
postPatch = let
libext = stdenv.hostPlatform.extensions.sharedLibrary;
in ''
sed -i "${path_hack_script}" enchant/_enchant.py
# They hardcode a bad path for Darwin in their library search code
substituteInPlace enchant/_enchant.py --replace '/opt/local/lib/' ""
# Use the $PYENCHANT_LIBRARY_PATH envvar lookup line to hard-code the
# location of the nix enchant-2 library into _enchant.py.
#
# Also, they hardcode a bad path for Darwin in their library search code;
# This code should never be hit, but in case it does, we don't want to have
# it "accidentally" work by pulling something from /opt.
substituteInPlace enchant/_enchant.py \
--replace 'os.environ.get("PYENCHANT_LIBRARY_PATH")' \
"'${enchant2}/lib/libenchant-2${libext}'" \
--replace '/opt/local/lib/' ""
'';
# dictionaries needed for tests
@ -31,7 +37,6 @@ buildPythonPackage rec {
description = "pyenchant: Python bindings for the Enchant spellchecker";
homepage = https://github.com/pyenchant/pyenchant;
license = licenses.lgpl21;
badPlatforms = [ "x86_64-darwin" ];
};
}

2
pkgs/top-level/python-packages.nix
View file

@ -4845,7 +4845,7 @@ in {
pyelftools = callPackage ../development/python-modules/pyelftools { };
pyenchant = callPackage ../development/python-modules/pyenchant { };
pyenchant = callPackage ../development/python-modules/pyenchant { enchant2 = pkgs.enchant2; };
pyexcelerator = callPackage ../development/python-modules/pyexcelerator { };