diff options
| author | Daniel Șerbănescu <daniel@serbanescu.dk> | 2022-01-13 14:15:56 +0100 |
|---|---|---|
| committer | Daniel Șerbănescu <daniel@serbanescu.dk> | 2022-01-13 14:15:56 +0100 |
| commit | 869684264137c977fe4e55d13ccde4d72ca1e3c8 (patch) | |
| tree | 0d8af0649a87eee91b43e39b4c368e2bcdb8786a /pkgs/desktops/gnome-2 | |
| parent | b426ea250c498a995d97b03907fde9ef592e6b9f (diff) | |
| download | nixpkgs-869684264137c977fe4e55d13ccde4d72ca1e3c8.tar nixpkgs-869684264137c977fe4e55d13ccde4d72ca1e3c8.tar.gz nixpkgs-869684264137c977fe4e55d13ccde4d72ca1e3c8.tar.bz2 nixpkgs-869684264137c977fe4e55d13ccde4d72ca1e3c8.tar.lz nixpkgs-869684264137c977fe4e55d13ccde4d72ca1e3c8.tar.xz nixpkgs-869684264137c977fe4e55d13ccde4d72ca1e3c8.tar.zst nixpkgs-869684264137c977fe4e55d13ccde4d72ca1e3c8.zip | |
gtkhtml4: added support for enchant2
Diffstat (limited to 'pkgs/desktops/gnome-2')
| -rw-r--r-- | pkgs/desktops/gnome-2/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix | 26 |
2 files changed, 21 insertions, 7 deletions
diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix index 72216863206..5ef6026f2ff 100644 --- a/pkgs/desktops/gnome-2/default.nix +++ b/pkgs/desktops/gnome-2/default.nix @@ -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 { }; diff --git a/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix b/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix index d8e1ea7108e..9447a381a3f 100644 --- a/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix +++ b/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix @@ -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="; + }) + ]; } |