diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-06-03 10:54:36 -0400 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2019-06-03 12:47:28 -0400 |
| commit | ba76fa91c762160e0d75a4cba74b44a0c3f911e7 (patch) | |
| tree | 949dbaaf7e15aed89028e7741ab3d1c3a52327b7 /pkgs/desktops/gnome-2 | |
| parent | 3e96aebf4ed7176acb5e94e9dcf62b64b0c1cf22 (diff) | |
| download | nixpkgs-ba76fa91c762160e0d75a4cba74b44a0c3f911e7.tar nixpkgs-ba76fa91c762160e0d75a4cba74b44a0c3f911e7.tar.gz nixpkgs-ba76fa91c762160e0d75a4cba74b44a0c3f911e7.tar.bz2 nixpkgs-ba76fa91c762160e0d75a4cba74b44a0c3f911e7.tar.lz nixpkgs-ba76fa91c762160e0d75a4cba74b44a0c3f911e7.tar.xz nixpkgs-ba76fa91c762160e0d75a4cba74b44a0c3f911e7.tar.zst nixpkgs-ba76fa91c762160e0d75a4cba74b44a0c3f911e7.zip | |
treewide: handle enchant = enchant2
patch or provide backup to enchant1 where necessary
Diffstat (limited to 'pkgs/desktops/gnome-2')
| -rw-r--r-- | pkgs/desktops/gnome-2/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix index b1a2d6ae7fa..95e6d0f12b0 100644 --- a/pkgs/desktops/gnome-2/default.nix +++ b/pkgs/desktops/gnome-2/default.nix @@ -47,9 +47,9 @@ lib.makeScope pkgs.newScope (self: with self; { 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 { }; diff --git a/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix b/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix index 493f88290f3..f38ad7f2491 100644 --- a/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix +++ b/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, gtk3, intltool, -GConf, enchant, isocodes, gnome_icon_theme, gsettings-desktop-schemas }: +{ stdenv, fetchurl, pkgconfig, gtk3, intltool, fetchpatch +, GConf, enchant, isocodes, gnome_icon_theme, gsettings-desktop-schemas }: stdenv.mkDerivation rec { version = "4.10.0"; |