gtkhtml4: added support for enchant2
This commit is contained in:
parent
b426ea250c
commit
8696842641
2 changed files with 21 additions and 7 deletions
|
@ -49,7 +49,7 @@ lib.makeScope pkgs.newScope (self: with self; {
|
|||
|
||||
gtkhtml = callPackage ./platform/gtkhtml { enchant = pkgs.enchant1; };
|
||||
|
||||
gtkhtml4 = callPackage ./platform/gtkhtml/4.x.nix { enchant = pkgs.enchant1; };
|
||||
gtkhtml4 = callPackage ./platform/gtkhtml/4.x.nix { enchant = pkgs.enchant2; };
|
||||
|
||||
gtkglext = callPackage ./platform/gtkglext { };
|
||||
|
||||
|
|
|
@ -1,16 +1,30 @@
|
|||
{ stdenv, fetchurl, pkg-config, gtk3, intltool
|
||||
{ stdenv, fetchFromGitLab, pkg-config, gtk3, intltool, autoreconfHook, fetchpatch
|
||||
, GConf, enchant, isocodes, gnome-icon-theme, gsettings-desktop-schemas }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "4.10.0";
|
||||
pname = "gtkhtml";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gtkhtml/4.10/${pname}-${version}.tar.xz";
|
||||
sha256 = "1hq6asgb5n9q3ryx2vngr4jyi8lg65lzpnlgrgcwayiczcj68fya";
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "Archive";
|
||||
repo = "gtkhtml";
|
||||
rev = "master";
|
||||
sha256 = "sha256-jL8YADvhW0o6I/2Uo5FNARMAnSbvtmFp+zWH1yCVvQk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ gsettings-desktop-schemas gtk3 gnome-icon-theme GConf ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ intltool enchant isocodes ];
|
||||
buildInputs = [ intltool enchant isocodes autoreconfHook ];
|
||||
|
||||
patchFlags = [ "-p0" ];
|
||||
|
||||
patches = [
|
||||
# Enables enchant2 support.
|
||||
# Upstream is dead, no further releases are coming.
|
||||
(fetchpatch {
|
||||
name ="enchant-2.patch";
|
||||
url = "https://aur.archlinux.org/cgit/aur.git/plain/enchant-2.patch?h=gtkhtml4&id=0218303a63d64c04d6483a6fe9bb55063fcfaa43";
|
||||
sha256 = "sha256-jkA/GgIiJZmxkbcBGQ26OZ1nuI502BMPwbPhsZkbgbY=";
|
||||
})
|
||||
];
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue