Unverified Commit 802c7a0c authored by Bobby Rong's avatar Bobby Rong
Browse files

gtkspell2: Build with enchant2 

We want to remove enchant1 when possible.
parent 2cae7169

pkgs/development/libraries/gtkspell/default.nix

+35 −3
Original line number Diff line number Diff line 
{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";

pkgs/top-level/all-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -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 { };