summary refs log tree commit diff
diff options
context:
space:
mode:
authorGraham Christensen <graham@grahamc.com>2017-02-15 21:28:35 -0500
committerGitHub <noreply@github.com>2017-02-15 21:28:35 -0500
commit7943dc897895a844b5c7bbf02e4b216cf6a1fdf2 (patch)
tree2c2178f743deda3115c5fd8917833f7f3c1c147f
parentb3c6449e13c447f02ef500b81b566cfc28e7e91a (diff)
parent54e3fad0f4376f7f92f0f4d89e0cc429784475b6 (diff)
downloadnixlib-7943dc897895a844b5c7bbf02e4b216cf6a1fdf2.tar
nixlib-7943dc897895a844b5c7bbf02e4b216cf6a1fdf2.tar.gz
nixlib-7943dc897895a844b5c7bbf02e4b216cf6a1fdf2.tar.bz2
nixlib-7943dc897895a844b5c7bbf02e4b216cf6a1fdf2.tar.lz
nixlib-7943dc897895a844b5c7bbf02e4b216cf6a1fdf2.tar.xz
nixlib-7943dc897895a844b5c7bbf02e4b216cf6a1fdf2.tar.zst
nixlib-7943dc897895a844b5c7bbf02e4b216cf6a1fdf2.zip
Merge pull request #22843 from bendlas/update-webkitgtk
webkitgtk212x: remove
-rw-r--r--pkgs/development/libraries/webkitgtk/2.12.nix57
-rw-r--r--pkgs/top-level/all-packages.nix5
2 files changed, 0 insertions, 62 deletions
diff --git a/pkgs/development/libraries/webkitgtk/2.12.nix b/pkgs/development/libraries/webkitgtk/2.12.nix
deleted file mode 100644
index 04ab4d967737..000000000000
--- a/pkgs/development/libraries/webkitgtk/2.12.nix
+++ /dev/null
@@ -1,57 +0,0 @@
-{ stdenv, fetchurl, perl, python2, ruby, bison, gperf, cmake
-, pkgconfig, gettext, gobjectIntrospection, libnotify
-, gtk2, gtk3, wayland, libwebp, enchant, xlibs, libxkbcommon, epoxy, at_spi2_core
-, libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs
-, enableGeoLocation ? true, geoclue2, sqlite
-, gst-plugins-base
-}:
-
-assert enableGeoLocation -> geoclue2 != null;
-
-with stdenv.lib;
-stdenv.mkDerivation rec {
-  name = "webkitgtk-${version}";
-  version = "2.12.5";
-
-  meta = {
-    description = "Web content rendering engine, GTK+ port";
-    homepage = "http://webkitgtk.org/";
-    license = licenses.bsd2;
-    platforms = platforms.linux;
-    hydraPlatforms = [];
-    maintainers = with maintainers; [ koral ];
-  };
-
-  preConfigure = "patchShebangs Tools";
-
-  src = fetchurl {
-    url = "http://webkitgtk.org/releases/${name}.tar.xz";
-    sha256 = "0h0wig413399wws6l88mn1nnjbqb42vb55yvz8az39b4p1a7h53b";
-  };
-
-  patches = [ ./finding-harfbuzz-icu.patch ];
-
-  cmakeFlags = [ "-DPORT=GTK" "-DUSE_LIBHYPHEN=0" ];
-
-  # XXX: WebKit2 missing include path for gst-plugins-base.
-  # Filled: https://bugs.webkit.org/show_bug.cgi?id=148894
-  NIX_CFLAGS_COMPILE = "-I${gst-plugins-base.dev}/include/gstreamer-1.0";
-
-  nativeBuildInputs = [
-    cmake perl python2 ruby bison gperf sqlite
-    pkgconfig gettext gobjectIntrospection
-  ];
-
-  buildInputs = [
-    gtk2 wayland libwebp enchant libnotify
-    libxml2 libsecret libxslt harfbuzz libpthreadstubs
-    gst-plugins-base libxkbcommon epoxy at_spi2_core
-  ] ++ optional enableGeoLocation geoclue2
-    ++ (with xlibs; [ libXdmcp libXt libXtst ]);
-
-  propagatedBuildInputs = [
-    libsoup gtk3
-  ];
-
-  enableParallelBuilding = true;
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 24e7580b99dd..353283a409b8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9838,11 +9838,6 @@ with pkgs;
     gst-plugins-base = gst_all_1.gst-plugins-base;
   };
 
-  webkitgtk212x = callPackage ../development/libraries/webkitgtk/2.12.nix {
-    harfbuzz = harfbuzz-icu;
-    gst-plugins-base = gst_all_1.gst-plugins-base;
-  };
-
   webkitgtk2 = webkitgtk24x.override {
     withGtk2 = true;
     enableIntrospection = false;