mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-02 15:41:48 +00:00
enchant: 1.6.1 -> 2.2.3
Moves default enchant to 2.2.3. Release url: https://github.com/AbiWord/enchant/releases/tag/v2.0.0 Mostly need to verify no breakage occurs for packages using enchant.
This commit is contained in:
parent
be705d8249
commit
3e96aebf4e
@ -1,6 +1,6 @@
|
||||
{ stdenv, fetchFromGitHub, pkgconfig, gtk2, lua, perl, python2
|
||||
, libtool, pciutils, dbus-glib, libcanberra-gtk2, libproxy
|
||||
, libsexy, enchant, libnotify, openssl, intltool
|
||||
, libsexy, enchant1, libnotify, openssl, intltool
|
||||
, desktop-file-utils, hicolor-icon-theme
|
||||
, autoconf, automake, autoconf-archive
|
||||
}:
|
||||
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
#hexchat and heachat-text loads enchant spell checking library at run time and so it needs to have route to the path
|
||||
patchPhase = ''
|
||||
sed -i "s,libenchant.so.1,${enchant}/lib/libenchant.so.1,g" src/fe-gtk/sexy-spell-entry.c
|
||||
sed -i "s,libenchant.so.1,${enchant1}/lib/libenchant.so.1,g" src/fe-gtk/sexy-spell-entry.c
|
||||
'';
|
||||
|
||||
preConfigure = ''
|
||||
|
@ -13,10 +13,10 @@ buildPythonPackage rec {
|
||||
sha256 = "fc31cda72ace001da8fe5d42f11c26e514a91fa8c70468739216ddd8de64e2a0";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ pkgs.enchant ];
|
||||
propagatedBuildInputs = [ pkgs.enchant1 ];
|
||||
|
||||
patchPhase = let
|
||||
path_hack_script = "s|LoadLibrary(e_path)|LoadLibrary('${pkgs.enchant}/lib/' + e_path)|";
|
||||
path_hack_script = "s|LoadLibrary(e_path)|LoadLibrary('${pkgs.enchant1}/lib/' + e_path)|";
|
||||
in ''
|
||||
sed -i "${path_hack_script}" enchant/_enchant.py
|
||||
|
||||
|
@ -10201,9 +10201,10 @@ in
|
||||
|
||||
elastix = callPackage ../development/libraries/science/biology/elastix { };
|
||||
|
||||
enchant = callPackage ../development/libraries/enchant { };
|
||||
enchant1 = callPackage ../development/libraries/enchant/1.x.nix { };
|
||||
|
||||
enchant2 = callPackage ../development/libraries/enchant/2.x.nix { };
|
||||
enchant = enchant2;
|
||||
|
||||
enet = callPackage ../development/libraries/enet { };
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user