From 802c7a0cafcef59b45b7fd7c2ebd960816245347 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 17 Jan 2023 12:42:51 +0800 Subject: [PATCH] gtkspell2: Build with enchant2 We want to remove enchant1 when possible. --- .../libraries/gtkspell/default.nix | 38 +++++++++++++++++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 36 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/gtkspell/default.nix b/pkgs/development/libraries/gtkspell/default.nix index 6f48ba4e2668..9c5c2b614fa2 100644 --- a/pkgs/development/libraries/gtkspell/default.nix +++ b/pkgs/development/libraries/gtkspell/default.nix @@ -1,4 +1,16 @@ -{lib, stdenv, fetchurl, gtk2, aspell, pkg-config, enchant, intltool}: +{ stdenv +, lib +, fetchurl +, fetchpatch +, autoreconfHook +, docbook_xsl +, gtk-doc +, intltool +, pkg-config +, aspell +, enchant +, gtk2 +}: stdenv.mkDerivation rec { pname = "gtkspell"; @@ -9,8 +21,28 @@ stdenv.mkDerivation rec { sha256 = "00hdv28bp72kg1mq2jdz1sdw2b8mb9iclsp7jdqwpck705bdriwg"; }; - nativeBuildInputs = [ pkg-config intltool ]; - buildInputs = [aspell gtk2 enchant]; + patches = [ + # Build with enchant 2 + # https://github.com/archlinux/svntogit-packages/tree/packages/gtkspell/trunk + (fetchpatch { + url = "https://github.com/archlinux/svntogit-packages/raw/17fb30b5196db378c18e7c115f28e97b962b95ff/trunk/enchant-2.diff"; + sha256 = "0d9409bnapwzwhnfpz3dvl6qalskqa4lzmhrmciazsypbw3ry5rf"; + }) + ]; + + nativeBuildInputs = [ + autoreconfHook + docbook_xsl + gtk-doc + intltool + pkg-config + ]; + + buildInputs = [ + aspell + enchant + gtk2 + ]; meta = with lib; { description = "Word-processor-style highlighting and replacement of misspelled words"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 37e57324b92c..b6ae4484aeca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20006,7 +20006,7 @@ with pkgs; gtksourceviewmm4 = callPackage ../development/libraries/gtksourceviewmm/4.x.nix { }; - gtkspell2 = callPackage ../development/libraries/gtkspell { enchant = enchant1; }; + gtkspell2 = callPackage ../development/libraries/gtkspell { }; gtkspell3 = callPackage ../development/libraries/gtkspell/3.nix { };