JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

midori: update to current webkitgtk (#17731)

Browse Source
This commit is contained in:
Ram Kromberg 2016-08-15 00:49:19 +03:00 committed by Robin Gloster
parent 4cbcab54a6
commit 7802a0f14b
2 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
pkgs/applications/networking/browsers/midori/default.nix
View File

@ -1,19 +1,21 @@
{ stdenv, fetchurl, cmake, pkgconfig, intltool, vala, makeWrapper
{ stdenv, fetchurl, cmake, pkgconfig, intltool, vala, wrapGAppsHook
, gtk3, webkitgtk, librsvg, libnotify, sqlite
, glib_networking, gsettings_desktop_schemas, libsoup, pcre, gnome3
, libxcb, libpthreadstubs, libXdmcp, libxkbcommon, epoxy, at_spi2_core
, zeitgeistSupport ? false, zeitgeist ? null
}:
let
version = "0.5.11";
in
assert zeitgeistSupport -> zeitgeist != null;
stdenv.mkDerivation rec {
name = "midori-${version}";
version = "0.5.11";
meta = with stdenv.lib; {
description = "Lightweight WebKitGTK+ web browser";
homepage = "http://midori-browser.org";
license = licenses.lgpl21Plus;
platforms = platforms.linux;
license = with licenses; [ lgpl21Plus ];
platforms = with platforms; linux;
maintainers = with maintainers; [ raskin ramkromberg ];
};
@ -26,24 +28,29 @@ stdenv.mkDerivation rec {
sha256 = "0gcwqkcyliqz10i33ww3wl02mmfnl7jzl2d493l4l53ipsb1l6cn";
};
nativeBuildInputs = [
pkgconfig wrapGAppsHook cmake intltool
];
buildInputs = [
cmake pkgconfig intltool vala makeWrapper
webkitgtk librsvg libnotify sqlite gsettings_desktop_schemas pcre gnome3.gcr
vala
gtk3 webkitgtk librsvg libnotify sqlite gsettings_desktop_schemas pcre gnome3.gcr
libxcb libpthreadstubs libXdmcp libxkbcommon epoxy at_spi2_core
(libsoup.override {gnomeSupport = true; valaSupport = true;})
] ++ stdenv.lib.optionals zeitgeistSupport [
zeitgeist
];
cmakeFlags = [
"-DCMAKE_BUILD_TYPE=Release"
"-DUSE_ZEITGEIST=OFF"
"-DHALF_BRO_INCOM_WEBKIT2=OFF"
"-DUSE_ZEITGEIST=${if zeitgeistSupport then "ON" else "OFF"}"
"-DHALF_BRO_INCOM_WEBKIT2=ON"
"-DUSE_GTK3=1"
];
NIX_LDFLAGS="-lX11";
preFixup = ''
wrapProgram $out/bin/midori \
--prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules" \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules")
'';
}

4
pkgs/top-level/all-packages.nix
View File

@ -13848,9 +13848,7 @@ in
mid2key = callPackage ../applications/audio/mid2key { };
midori-unwrapped = callPackage ../applications/networking/browsers/midori {
webkitgtk = webkitgtk24x;
};
midori-unwrapped = callPackage ../applications/networking/browsers/midori { };
midori = wrapFirefox midori-unwrapped { };
mikmod = callPackage ../applications/audio/mikmod { };