public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: handle enchant = enchant2

Browse Source 
patch or provide backup to enchant1 where necessary
This commit is contained in:
Matthew Bauer 2019-06-03 10:54:36 -04:00
parent 3e96aebf4e
commit ba76fa91c7
7 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/desktops/gnome-2/default.nix
View File

@ -47,9 +47,9 @@ lib.makeScope pkgs.newScope (self: with self; {
libbonoboui = callPackage ./platform/libbonoboui { }; libbonoboui = callPackage ./platform/libbonoboui { };
gtkhtml = callPackage ./platform/gtkhtml { }; gtkhtml = callPackage ./platform/gtkhtml { enchant = pkgs.enchant1; };
gtkhtml4 = callPackage ./platform/gtkhtml/4.x.nix { }; gtkhtml4 = callPackage ./platform/gtkhtml/4.x.nix { enchant = pkgs.enchant1; };
gtkglext = callPackage ./platform/gtkglext { }; gtkglext = callPackage ./platform/gtkglext { };

4
pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, gtk3, intltool, { stdenv, fetchurl, pkgconfig, gtk3, intltool, fetchpatch
GConf, enchant, isocodes, gnome_icon_theme, gsettings-desktop-schemas }: , GConf, enchant, isocodes, gnome_icon_theme, gsettings-desktop-schemas }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "4.10.0"; version = "4.10.0";

2
pkgs/desktops/gnome-3/default.nix
View File

@ -347,7 +347,7 @@ lib.makeScope pkgs.newScope (self: with self; {
pidgin-im-gnome-shell-extension = callPackage ./misc/pidgin { }; pidgin-im-gnome-shell-extension = callPackage ./misc/pidgin { };
gtkhtml = callPackage ./misc/gtkhtml { }; gtkhtml = callPackage ./misc/gtkhtml { enchant = pkgs.enchant1; };
pomodoro = callPackage ./misc/pomodoro { }; pomodoro = callPackage ./misc/pomodoro { };

2
pkgs/desktops/gnome-3/misc/gtkhtml/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, gtk3, intltool { stdenv, fetchurl, pkgconfig, gtk3, intltool, fetchpatch
, gnome3, enchant, isocodes, gsettings-desktop-schemas }: , gnome3, enchant, isocodes, gsettings-desktop-schemas }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {

6
pkgs/development/libraries/gtkspell/3.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, gtk3, aspell, pkgconfig, enchant2, isocodes, intltool, gobject-introspection, vala}: {stdenv, fetchurl, gtk3, aspell, pkgconfig, enchant, isocodes, intltool, gobject-introspection, vala}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gtkspell-${version}"; name = "gtkspell-${version}";
@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ pkgconfig intltool gobject-introspection vala ]; nativeBuildInputs = [ pkgconfig intltool gobject-introspection vala ];
buildInputs = [ aspell gtk3 enchant2 isocodes ]; buildInputs = [ aspell gtk3 enchant isocodes ];
propagatedBuildInputs = [ enchant2 ]; propagatedBuildInputs = [ enchant ];
configureFlags = [ configureFlags = [
"--enable-introspection" "--enable-introspection"

4
pkgs/tools/inputmethods/fcitx/unwrapped.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, cmake, intltool, gettext { stdenv, fetchurl, pkgconfig, cmake, intltool, gettext
, libxml2, enchant, isocodes, icu, libpthreadstubs , libxml2, enchant1, isocodes, icu, libpthreadstubs
, pango, cairo, libxkbfile, libXau, libXdmcp, libxkbcommon , pango, cairo, libxkbfile, libXau, libXdmcp, libxkbcommon
, dbus, gtk2, gtk3, qt4, extra-cmake-modules , dbus, gtk2, gtk3, qt4, extra-cmake-modules
, xkeyboard_config, pcre, libuuid , xkeyboard_config, pcre, libuuid
@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake extra-cmake-modules intltool pkgconfig pcre ]; nativeBuildInputs = [ cmake extra-cmake-modules intltool pkgconfig pcre ];
buildInputs = [ buildInputs = [
xkeyboard_config enchant gettext isocodes icu libpthreadstubs libXau libXdmcp libxkbfile xkeyboard_config enchant1 gettext isocodes icu libpthreadstubs libXau libXdmcp libxkbfile
libxkbcommon libxml2 dbus cairo gtk2 gtk3 pango qt4 libuuid libxkbcommon libxml2 dbus cairo gtk2 gtk3 pango qt4 libuuid
]; ];

9
pkgs/top-level/all-packages.nix
View File

@ -10802,7 +10802,7 @@ in
gtksourceviewmm4 = callPackage ../development/libraries/gtksourceviewmm/4.x.nix { }; gtksourceviewmm4 = callPackage ../development/libraries/gtksourceviewmm/4.x.nix { };
gtkspell2 = callPackage ../development/libraries/gtkspell { }; gtkspell2 = callPackage ../development/libraries/gtkspell { enchant = enchant1; };
gtkspell3 = callPackage ../development/libraries/gtkspell/3.nix { }; gtkspell3 = callPackage ../development/libraries/gtkspell/3.nix { };
@ -13282,7 +13282,7 @@ in
subdl = callPackage ../applications/video/subdl { }; subdl = callPackage ../applications/video/subdl { };
subtitleeditor = callPackage ../applications/video/subtitleeditor { }; subtitleeditor = callPackage ../applications/video/subtitleeditor { enchant = enchant1; };
suil = callPackage ../development/libraries/audio/suil { }; suil = callPackage ../development/libraries/audio/suil { };
@ -20992,7 +20992,9 @@ in
xmind = callPackage ../applications/misc/xmind { }; xmind = callPackage ../applications/misc/xmind { };
xneur = callPackage ../applications/misc/xneur { }; xneur = callPackage ../applications/misc/xneur {
enchant = enchant1;
};
gxneur = callPackage ../applications/misc/gxneur { gxneur = callPackage ../applications/misc/gxneur {
inherit (gnome2) libglade GConf; inherit (gnome2) libglade GConf;
@ -21003,6 +21005,7 @@ in
inherit (gnome2) libglade scrollkeeper; inherit (gnome2) libglade scrollkeeper;
gtkhtml = gnome2.gtkhtml4; gtkhtml = gnome2.gtkhtml4;
python = python27; python = python27;
enchant = enchant1;
}; };
xournal = callPackage ../applications/graphics/xournal { xournal = callPackage ../applications/graphics/xournal {