diff options
| author | Bobby Rong <rjl931189261@126.com> | 2023-01-15 11:19:06 +0800 |
|---|---|---|
| committer | Bobby Rong <rjl931189261@126.com> | 2023-01-15 11:20:21 +0800 |
| commit | 0ff53d61ff8e635819cea4fe700e1920cbf9dc3e (patch) | |
| tree | ea39bcb158107678993ecdad1a76ace225ee5ba0 /pkgs/desktops/gnome-2 | |
| parent | cddd1837e623a3fad53bf7a468779e500a83bc97 (diff) | |
| download | nixpkgs-0ff53d61ff8e635819cea4fe700e1920cbf9dc3e.tar nixpkgs-0ff53d61ff8e635819cea4fe700e1920cbf9dc3e.tar.gz nixpkgs-0ff53d61ff8e635819cea4fe700e1920cbf9dc3e.tar.bz2 nixpkgs-0ff53d61ff8e635819cea4fe700e1920cbf9dc3e.tar.lz nixpkgs-0ff53d61ff8e635819cea4fe700e1920cbf9dc3e.tar.xz nixpkgs-0ff53d61ff8e635819cea4fe700e1920cbf9dc3e.tar.zst nixpkgs-0ff53d61ff8e635819cea4fe700e1920cbf9dc3e.zip | |
gnome2.gtkhtml: remove
Unmaintained and no package depends on it.
Diffstat (limited to 'pkgs/desktops/gnome-2')
| -rw-r--r-- | pkgs/desktops/gnome-2/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/desktops/gnome-2/platform/gtkhtml/01_remove-disable-deprecated.patch | 17 | ||||
| -rw-r--r-- | pkgs/desktops/gnome-2/platform/gtkhtml/default.nix | 21 |
3 files changed, 1 insertions, 40 deletions
diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix index f04eddb74f4..ba863c08a2b 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 { }; - gtkhtml = callPackage ./platform/gtkhtml { enchant = pkgs.enchant1; }; - gtkhtml4 = callPackage ./platform/gtkhtml/4.x.nix { enchant = pkgs.enchant2; }; gtkglext = callPackage ./platform/gtkglext { }; @@ -71,6 +69,7 @@ lib.makeScope pkgs.newScope (self: with self; { gnome_common = gnome-common; 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 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/01_remove-disable-deprecated.patch b/pkgs/desktops/gnome-2/platform/gtkhtml/01_remove-disable-deprecated.patch deleted file mode 100644 index 1d9a179d236..00000000000 --- a/pkgs/desktops/gnome-2/platform/gtkhtml/01_remove-disable-deprecated.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -Naur gtkhtml-3.32.2-orig/configure gtkhtml-3.32.2/configure ---- gtkhtml-3.32.2-orig/configure 2011-02-05 23:12:31.000000000 -0500 -+++ gtkhtml-3.32.2/configure 2011-04-22 13:03:18.228874636 -0400 -@@ -5761,12 +5761,7 @@ - - if test "x${enable_deprecated_flags}" = "xyes"; then - -- list="-DG_DISABLE_DEPRECATED -- -DPANGO_DISABLE_DEPRECATED -- -DGDK_DISABLE_DEPRECATED -- -DGDK_PIXBUF_DISABLE_DEPRECATED -- -DGTK_DISABLE_DEPRECATED -- -DGNOME_DISABLE_DEPRECATED" -+ list="" - flags_supported="" - flags_unsupported="" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for supported compiler flags" >&5 diff --git a/pkgs/desktops/gnome-2/platform/gtkhtml/default.nix b/pkgs/desktops/gnome-2/platform/gtkhtml/default.nix deleted file mode 100644 index 206494e7022..00000000000 --- a/pkgs/desktops/gnome-2/platform/gtkhtml/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, gtk2, intltool, -GConf, enchant, isocodes, gnome-icon-theme }: - -stdenv.mkDerivation rec { - pname = "gtkhtml"; - version = "3.32.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gtkhtml/${lib.versions.majorMinor version}/gtkhtml-${version}.tar.bz2"; - sha256 = "17z3jwvpn8waz7bhwrk7a6vs9pad6sqmlxxcqwvxxq89ywy0ail7"; - }; - - #From Debian, fixes build issue described here: - #http://www.mail-archive.com/debian-bugs-rc@lists.debian.org/msg250091.html - patches = [ ./01_remove-disable-deprecated.patch ]; - - nativeBuildInputs = [ pkg-config intltool ]; - buildInputs = [ gtk2 GConf enchant isocodes gnome-icon-theme ]; - - NIX_LDFLAGS = "-lgthread-2.0"; -} |