diff options
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/desktops/gnome/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/desktops/gnome/misc/gtkhtml/default.nix | 15 |
2 files changed, 14 insertions, 3 deletions
diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index 52e37c05b39f6..fa9b8eef06593 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -254,7 +254,7 @@ lib.makeScope pkgs.newScope (self: with self; { nautilus-python = callPackage ./misc/nautilus-python { }; - gtkhtml = callPackage ./misc/gtkhtml { enchant = pkgs.enchant1; }; + gtkhtml = callPackage ./misc/gtkhtml { enchant = pkgs.enchant2; }; pomodoro = callPackage ./misc/pomodoro { }; diff --git a/pkgs/desktops/gnome/misc/gtkhtml/default.nix b/pkgs/desktops/gnome/misc/gtkhtml/default.nix index f4454e15bb9e6..9eb93bc8bc44a 100644 --- a/pkgs/desktops/gnome/misc/gtkhtml/default.nix +++ b/pkgs/desktops/gnome/misc/gtkhtml/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gtk3, intltool +{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, pkg-config, gtk3, intltool , gnome, enchant, isocodes, gsettings-desktop-schemas }: stdenv.mkDerivation rec { @@ -10,11 +10,22 @@ stdenv.mkDerivation rec { sha256 = "ca3b6424fb2c7ac5d9cb8fdafb69318fa2e825c9cf6ed17d1e38d9b29e5606c3"; }; + 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 = "f0OToWGHZwxvqf+0qosfA9FfwJ/IXfjIPP5/WrcvArI="; + extraPrefix = ""; + }) + ]; + passthru = { updateScript = gnome.updateScript { packageName = "gtkhtml"; attrPath = "gnome.gtkhtml"; }; }; - nativeBuildInputs = [ pkg-config intltool ]; + nativeBuildInputs = [ autoreconfHook pkg-config intltool ]; buildInputs = [ gtk3 gnome.adwaita-icon-theme gsettings-desktop-schemas ]; |