summary refs log tree commit diff
diff options
context:
space:
mode:
authorBobby Rong <rjl931189261@126.com>2023-01-15 11:56:53 +0800
committerBobby Rong <rjl931189261@126.com>2023-01-15 11:56:53 +0800
commit5418640b81fb505e3999089777cca78bbc76486d (patch)
tree86aec934133ca4a45347993fa29a047d57bdc6a9
parentdf34371428185b3099e2cffd1f825ca17a5254b7 (diff)
downloadnixpkgs-5418640b81fb505e3999089777cca78bbc76486d.tar
nixpkgs-5418640b81fb505e3999089777cca78bbc76486d.tar.gz
nixpkgs-5418640b81fb505e3999089777cca78bbc76486d.tar.bz2
nixpkgs-5418640b81fb505e3999089777cca78bbc76486d.tar.lz
nixpkgs-5418640b81fb505e3999089777cca78bbc76486d.tar.xz
nixpkgs-5418640b81fb505e3999089777cca78bbc76486d.tar.zst
nixpkgs-5418640b81fb505e3999089777cca78bbc76486d.zip
gnome2.gtkhtml4: remove
Unmaintained and no package depends on it.
-rw-r--r--pkgs/desktops/gnome-2/default.nix3
-rw-r--r--pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix30
2 files changed, 1 insertions, 32 deletions
diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix
index ba863c08a2b..8e82f4d0fe3 100644
--- a/pkgs/desktops/gnome-2/default.nix
+++ b/pkgs/desktops/gnome-2/default.nix
@@ -35,8 +35,6 @@ lib.makeScope pkgs.newScope (self: with self; {
 
   libbonoboui = callPackage ./platform/libbonoboui { };
 
-  gtkhtml4 = callPackage ./platform/gtkhtml/4.x.nix { enchant = pkgs.enchant2; };
-
   gtkglext = callPackage ./platform/gtkglext { };
 
 #### DESKTOP
@@ -70,6 +68,7 @@ lib.makeScope pkgs.newScope (self: with self; {
   gnome_python = throw "gnome2.gnome_python has been removed"; # 2023-01-14
   gnome_python_desktop = throw "gnome2.gnome_python_desktop has been removed"; # 2023-01-14
   gtkhtml = throw "gnome2.gtkhtml has been removed"; # 2023-01-15
+  gtkhtml4 = throw "gnome2.gtkhtml4 has been removed"; # 2023-01-15
   libglademm = throw "gnome2.libglademm has been removed"; # 2022-01-15
   libgnomecups = throw "gnome2.libgnomecups has been removed"; # 2023-01-15
   libgnomeprint = throw "gnome2.libgnomeprint has been removed"; # 2023-01-15
diff --git a/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix b/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix
deleted file mode 100644
index 72422cf41c3..00000000000
--- a/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ 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 = fetchFromGitLab {
-    domain = "gitlab.gnome.org";
-    owner = "Archive";
-    repo = "gtkhtml";
-    rev = "master";
-    sha256 = "sha256-jL8YADvhW0o6I/2Uo5FNARMAnSbvtmFp+zWH1yCVvQk=";
-  };
-
-  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 = "f0OToWGHZwxvqf+0qosfA9FfwJ/IXfjIPP5/WrcvArI=";
-      extraPrefix = "";
-    })
-  ];
-
-  propagatedBuildInputs = [ gsettings-desktop-schemas gtk3 gnome-icon-theme GConf ];
-  nativeBuildInputs = [ pkg-config autoreconfHook intltool ];
-  buildInputs = [ enchant isocodes ];
-}