From 6d95751d8590fb43e9cd520650109965eb451cd9 Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Thu, 22 Sep 2016 22:30:31 +0200 Subject: [PATCH] webkitgtk210x: remove --- pkgs/development/libraries/webkitgtk/2.10.nix | 86 ------------------- pkgs/top-level/all-packages.nix | 5 -- 2 files changed, 91 deletions(-) delete mode 100644 pkgs/development/libraries/webkitgtk/2.10.nix diff --git a/pkgs/development/libraries/webkitgtk/2.10.nix b/pkgs/development/libraries/webkitgtk/2.10.nix deleted file mode 100644 index e74cc6421b2..00000000000 --- a/pkgs/development/libraries/webkitgtk/2.10.nix +++ /dev/null @@ -1,86 +0,0 @@ -{ stdenv, fetchurl, fetchpatch, perl, python, ruby, bison, gperf, cmake -, pkgconfig, gettext, gobjectIntrospection, libnotify -, gtk2, gtk3, wayland, libwebp, enchant -, libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs -, enableGeoLocation ? false, geoclue2, sqlite, xorg -, enableCredentialStorage ? !stdenv.isDarwin -, gst-plugins-base, readline, libedit -}: - -assert enableGeoLocation -> geoclue2 != null; -assert stdenv.isDarwin -> !enableCredentialStorage; - -with stdenv.lib; -stdenv.mkDerivation rec { - name = "webkitgtk-${version}"; - version = "2.10.9"; - - 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 = "0sg935wpkgyd5ypd5fj25vd7ri8s6sbrmssb53xbgcc02xs8vcdv"; - }; - - patches = [ - ./finding-harfbuzz-icu.patch - ] ++ optional stdenv.isDarwin ./adding-libintl.patch; - - cmakeFlags = [ - "-DPORT=GTK" - "-DUSE_LIBHYPHEN=OFF" - ] ++ optionals (!enableCredentialStorage) [ - "-DENABLE_CREDENTIAL_STORAGE=OFF" - ] ++ optionals (!enableGeoLocation) [ - "-DENABLE_GEOLOCATION=OFF" - ] ++ optionals stdenv.isDarwin [ - "-DENABLE_WEBKIT=ON" - "-DENABLE_X11_TARGET=OFF" - "-DENABLE_QUARTZ_TARGET=ON" - "-DENABLE_TOOLS=ON" - "-DENABLE_MINIBROWSER=ON" - "-DENABLE_PLUGIN_PROCESS_GTK2=OFF" - "-DENABLE_VIDEO=OFF" - "-DENABLE_WEB_AUDIO=OFF" - "-DENABLE_OPENGL=OFF" - "-DENABLE_INTROSPECTION=OFF" - "-DUSE_LIBNOTIFY=OFF" - "-DCMAKE_SHARED_LINKER_FLAGS=-L/path/to/nonexistent/folder" - ]; - - # 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 python ruby bison gperf sqlite - pkgconfig gettext gobjectIntrospection - ]; - - buildInputs = [ - gtk2 libwebp enchant libnotify - libxml2 libxslt harfbuzz libpthreadstubs - gst-plugins-base xorg.libXt - ] ++ optionals enableCredentialStorage [ - libsecret - ] ++ (if stdenv.isDarwin then [ - readline libedit - ] else [ - wayland - ]) ++ optional enableGeoLocation geoclue2; - - propagatedBuildInputs = [ - libsoup gtk3 - ]; - - enableParallelBuilding = true; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 865fc349898..62c7fe096a8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9822,11 +9822,6 @@ in gst-plugins-base = gst_all_1.gst-plugins-base; }; - webkitgtk210x = callPackage ../development/libraries/webkitgtk/2.10.nix { - harfbuzz = harfbuzz-icu; - gst-plugins-base = gst_all_1.gst-plugins-base; - }; - webkitgtk2 = webkitgtk24x.override { withGtk2 = true; enableIntrospection = false;