gnome.gtkhtml: use enchant2

We expect gnome2.gtkhtml4 provides exactly the same thing as gnome.gtkhtml.

This applies 8696842 to this package as well.

+14 -3
+1 -1
pkgs/desktops/gnome/default.nix
··· 254 255 nautilus-python = callPackage ./misc/nautilus-python { }; 256 257 - gtkhtml = callPackage ./misc/gtkhtml { enchant = pkgs.enchant1; }; 258 259 pomodoro = callPackage ./misc/pomodoro { }; 260
··· 254 255 nautilus-python = callPackage ./misc/nautilus-python { }; 256 257 + gtkhtml = callPackage ./misc/gtkhtml { enchant = pkgs.enchant2; }; 258 259 pomodoro = callPackage ./misc/pomodoro { }; 260
+13 -2
pkgs/desktops/gnome/misc/gtkhtml/default.nix
··· 1 - { lib, stdenv, fetchurl, pkg-config, gtk3, intltool 2 , gnome, enchant, isocodes, gsettings-desktop-schemas }: 3 4 stdenv.mkDerivation rec { ··· 10 sha256 = "ca3b6424fb2c7ac5d9cb8fdafb69318fa2e825c9cf6ed17d1e38d9b29e5606c3"; 11 }; 12 13 passthru = { 14 updateScript = gnome.updateScript { packageName = "gtkhtml"; attrPath = "gnome.gtkhtml"; }; 15 }; 16 17 - nativeBuildInputs = [ pkg-config intltool ]; 18 buildInputs = [ gtk3 gnome.adwaita-icon-theme 19 gsettings-desktop-schemas ]; 20
··· 1 + { lib, stdenv, fetchurl, fetchpatch, autoreconfHook, pkg-config, gtk3, intltool 2 , gnome, enchant, isocodes, gsettings-desktop-schemas }: 3 4 stdenv.mkDerivation rec { ··· 10 sha256 = "ca3b6424fb2c7ac5d9cb8fdafb69318fa2e825c9cf6ed17d1e38d9b29e5606c3"; 11 }; 12 13 + patches = [ 14 + # Enables enchant2 support. 15 + # Upstream is dead, no further releases are coming. 16 + (fetchpatch { 17 + name ="enchant-2.patch"; 18 + url = "https://aur.archlinux.org/cgit/aur.git/plain/enchant-2.patch?h=gtkhtml4&id=0218303a63d64c04d6483a6fe9bb55063fcfaa43"; 19 + sha256 = "f0OToWGHZwxvqf+0qosfA9FfwJ/IXfjIPP5/WrcvArI="; 20 + extraPrefix = ""; 21 + }) 22 + ]; 23 + 24 passthru = { 25 updateScript = gnome.updateScript { packageName = "gtkhtml"; attrPath = "gnome.gtkhtml"; }; 26 }; 27 28 + nativeBuildInputs = [ autoreconfHook pkg-config intltool ]; 29 buildInputs = [ gtk3 gnome.adwaita-icon-theme 30 gsettings-desktop-schemas ]; 31