diff options
author | Andreas Rammhold <andreas@rammhold.de> | 2018-10-09 22:33:49 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-09 22:33:49 +0200 |
commit | a00b820ddc0cf02aabd3e2fceb1089b5cf8b58ca (patch) | |
tree | c19e1083c6beff9109a6f4dc07520e89a666ea10 | |
parent | 27a24680ea76283f01a0318ff7d8b1d2e1dcd60e (diff) | |
parent | f0e5a51c98dd1b4c010251cf624f3556597d834d (diff) | |
download | nixlib-a00b820ddc0cf02aabd3e2fceb1089b5cf8b58ca.tar nixlib-a00b820ddc0cf02aabd3e2fceb1089b5cf8b58ca.tar.gz nixlib-a00b820ddc0cf02aabd3e2fceb1089b5cf8b58ca.tar.bz2 nixlib-a00b820ddc0cf02aabd3e2fceb1089b5cf8b58ca.tar.lz nixlib-a00b820ddc0cf02aabd3e2fceb1089b5cf8b58ca.tar.xz nixlib-a00b820ddc0cf02aabd3e2fceb1089b5cf8b58ca.tar.zst nixlib-a00b820ddc0cf02aabd3e2fceb1089b5cf8b58ca.zip |
Merge pull request #47949 from yrashk/webkitgtk222x
webkitgtk222x: init at 2.22.2
-rw-r--r-- | pkgs/applications/networking/mailreaders/astroid/default.nix | 17 | ||||
-rw-r--r-- | pkgs/applications/networking/mailreaders/astroid/run_tests.diff | 10 | ||||
-rw-r--r-- | pkgs/development/libraries/webkitgtk/2.22.nix | 83 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 7 |
4 files changed, 96 insertions, 21 deletions
diff --git a/pkgs/applications/networking/mailreaders/astroid/default.nix b/pkgs/applications/networking/mailreaders/astroid/default.nix index 0cb07b8ce755..8dd23df7749c 100644 --- a/pkgs/applications/networking/mailreaders/astroid/default.nix +++ b/pkgs/applications/networking/mailreaders/astroid/default.nix @@ -1,36 +1,31 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, gnome3, gmime3, webkitgtk +{ stdenv, fetchFromGitHub, cmake, pkgconfig, gnome3, gmime3, webkitgtk222x , libsass, notmuch, boost, wrapGAppsHook, glib-networking, protobuf, vim_configurable , makeWrapper, python3, python3Packages , vim ? vim_configurable.override { features = "normal"; gui = "auto"; } +, ronn }: stdenv.mkDerivation rec { name = "astroid-${version}"; - version = "0.13"; + version = "0.14"; src = fetchFromGitHub { owner = "astroidmail"; repo = "astroid"; rev = "v${version}"; - sha256 = "105x5g44hng3fi03h67j3an53088148jbq8726nmcp0zs0cy9gac"; + sha256 = "1wkv1icsx3g3gq485dnvcdhr9srrjgz4ws1i1krcw9n61bj7gxh8"; }; - nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ cmake ronn pkgconfig wrapGAppsHook ]; - buildInputs = [ gnome3.gtkmm gmime3 webkitgtk libsass gnome3.libpeas + buildInputs = [ gnome3.gtkmm gmime3 webkitgtk222x libsass gnome3.libpeas python3 python3Packages.pygobject3 notmuch boost gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme glib-networking protobuf ] ++ (if vim == null then [] else [ vim ]); - patches = [ - # TODO: remove when https://github.com/astroidmail/astroid/pull/531 - # is released - ./run_tests.diff - ]; - postPatch = '' sed -i "s~gvim ~${vim}/bin/vim -g ~g" src/config.cc sed -i "s~ -geom 10x10~~g" src/config.cc diff --git a/pkgs/applications/networking/mailreaders/astroid/run_tests.diff b/pkgs/applications/networking/mailreaders/astroid/run_tests.diff deleted file mode 100644 index 21b466741ce1..000000000000 --- a/pkgs/applications/networking/mailreaders/astroid/run_tests.diff +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/tests/run_test.sh b/tests/run_test.sh -index f2ea7d7..927c61d 100755 ---- a/tests/run_test.sh -+++ b/tests/run_test.sh -@@ -1,4 +1,4 @@ --#! /bin/bash -+#! /usr/bin/env bash - # - # Set up environment and run test specified on command line - diff --git a/pkgs/development/libraries/webkitgtk/2.22.nix b/pkgs/development/libraries/webkitgtk/2.22.nix new file mode 100644 index 000000000000..7eae5819daf1 --- /dev/null +++ b/pkgs/development/libraries/webkitgtk/2.22.nix @@ -0,0 +1,83 @@ +{ stdenv, fetchurl, perl, python2, ruby, bison, gperf, cmake, ninja +, pkgconfig, gettext, gobjectIntrospection, libnotify, gnutls, libgcrypt +, gtk3, wayland, libwebp, enchant2, xorg, libxkbcommon, epoxy, at-spi2-core +, libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs, pcre, nettle, libtasn1, p11-kit +, libidn, libedit, readline, libGLU_combined, libintl +, enableGeoLocation ? true, geoclue2, sqlite +, enableGtk2Plugins ? false, gtk2 ? null +, gst-plugins-base, gst-plugins-bad, woff2 +}: + +assert enableGeoLocation -> geoclue2 != null; +assert enableGtk2Plugins -> gtk2 != null; +assert stdenv.isDarwin -> !enableGtk2Plugins; + +with stdenv.lib; +stdenv.mkDerivation rec { + name = "webkitgtk-${version}"; + version = "2.22.2"; + + meta = { + description = "Web content rendering engine, GTK+ port"; + homepage = https://webkitgtk.org/; + license = licenses.bsd2; + platforms = platforms.linux; + hydraPlatforms = []; + maintainers = with maintainers; [ ]; + }; + + src = fetchurl { + url = "https://webkitgtk.org/releases/${name}.tar.xz"; + sha256 = "1flrbr8pzbrlwv09b4pmgh6vklw7jghd2lgrhcb72vl9s7a8fm1l"; + }; + + patches = optionals stdenv.isDarwin [ + ## TODO add necessary patches for Darwin + ]; + + postPatch = '' + patchShebangs . + ''; + + cmakeFlags = [ + "-DPORT=GTK" + "-DUSE_LIBHYPHEN=0" + "-DENABLE_INTROSPECTION=ON" + ] + ++ optional (!enableGtk2Plugins) "-DENABLE_PLUGIN_PROCESS_GTK2=OFF" + ++ optional stdenv.isLinux "-DENABLE_GLES2=ON" + ++ optionals stdenv.isDarwin [ + "-DUSE_SYSTEM_MALLOC=ON" + "-DUSE_ACCELERATE=0" + "-DENABLE_MINIBROWSER=OFF" + "-DENABLE_VIDEO=ON" + "-DENABLE_QUARTZ_TARGET=ON" + "-DENABLE_X11_TARGET=OFF" + "-DENABLE_OPENGL=OFF" + "-DENABLE_WEB_AUDIO=OFF" + "-DENABLE_WEBGL=OFF" + "-DENABLE_GRAPHICS_CONTEXT_3D=OFF" + "-DENABLE_GTKDOC=OFF" + ]; + + nativeBuildInputs = [ + cmake ninja perl python2 ruby bison gperf + pkgconfig gettext gobjectIntrospection + ]; + + buildInputs = [ + libintl libwebp enchant2 libnotify gnutls pcre nettle libidn libgcrypt woff2 + libxml2 libsecret libxslt harfbuzz libpthreadstubs libtasn1 p11-kit + sqlite gst-plugins-base gst-plugins-bad libxkbcommon epoxy at-spi2-core + ] ++ optional enableGeoLocation geoclue2 + ++ optional enableGtk2Plugins gtk2 + ++ (with xorg; [ libXdmcp libXt libXtst libXdamage ]) + ++ optionals stdenv.isDarwin [ libedit readline libGLU_combined ] + ++ optional stdenv.isLinux wayland; + + propagatedBuildInputs = [ + libsoup gtk3 + ]; + + outputs = [ "out" "dev" ]; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cf92b5eb1c26..a8a54a8b6827 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12568,6 +12568,13 @@ with pkgs; stdenv = overrideCC stdenv gcc6; }; + webkitgtk222x = callPackage ../development/libraries/webkitgtk/2.22.nix { + harfbuzz = harfbuzzFull; + inherit (gst_all_1) gst-plugins-base gst-plugins-bad; + stdenv = overrideCC stdenv gcc6; + }; + + webkitgtk24x-gtk2 = webkitgtk24x-gtk3.override { withGtk2 = true; enableIntrospection = false; |