midori: 0.5.8 -> 0.5.11 (#17142)
This commit is contained in:
parent
a5d1c8d471
commit
5685968ca6
@ -1,20 +1,20 @@
|
|||||||
{ stdenv, fetchurl, cmake, pkgconfig, intltool, vala, makeWrapper
|
{ stdenv, fetchurl, cmake, pkgconfig, intltool, vala, makeWrapper
|
||||||
, gtk3, webkitgtk, librsvg, libnotify, sqlite
|
, gtk3, webkitgtk, librsvg, libnotify, sqlite
|
||||||
, glib_networking, gsettings_desktop_schemas, libsoup
|
, glib_networking, gsettings_desktop_schemas, libsoup, pcre, gnome3
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
version = "0.5.8";
|
version = "0.5.11";
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "midori-${version}";
|
name = "midori-${version}";
|
||||||
|
|
||||||
meta = {
|
meta = with stdenv.lib; {
|
||||||
description = "Lightweight WebKitGTK+ web browser";
|
description = "Lightweight WebKitGTK+ web browser";
|
||||||
homepage = "http://midori-browser.org";
|
homepage = "http://midori-browser.org";
|
||||||
license = stdenv.lib.licenses.lgpl21Plus;
|
license = licenses.lgpl21Plus;
|
||||||
platforms = stdenv.lib.platforms.linux;
|
platforms = platforms.linux;
|
||||||
maintainers = with stdenv.lib.maintainers; [ raskin ];
|
maintainers = with maintainers; [ raskin ramkromberg ];
|
||||||
};
|
};
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
@ -23,21 +23,21 @@ stdenv.mkDerivation rec {
|
|||||||
"http://mirrors-ru.go-parts.com/blfs/conglomeration/midori/midori_${version}_all_.tar.bz2"
|
"http://mirrors-ru.go-parts.com/blfs/conglomeration/midori/midori_${version}_all_.tar.bz2"
|
||||||
];
|
];
|
||||||
name = "midori_${version}_all_.tar.bz2";
|
name = "midori_${version}_all_.tar.bz2";
|
||||||
sha256 = "10ckm98rfqfbwr84b8mc1ssgj84wjgkr4dadvx2l7c64sigi66dg";
|
sha256 = "0gcwqkcyliqz10i33ww3wl02mmfnl7jzl2d493l4l53ipsb1l6cn";
|
||||||
};
|
};
|
||||||
|
|
||||||
sourceRoot = ".";
|
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
cmake pkgconfig intltool vala makeWrapper
|
cmake pkgconfig intltool vala makeWrapper
|
||||||
webkitgtk librsvg libnotify sqlite gsettings_desktop_schemas
|
webkitgtk librsvg libnotify sqlite gsettings_desktop_schemas pcre gnome3.gcr
|
||||||
(libsoup.override {gnomeSupport = true;})
|
(libsoup.override {gnomeSupport = true; valaSupport = true;})
|
||||||
];
|
];
|
||||||
|
|
||||||
cmakeFlags = ''
|
cmakeFlags = [
|
||||||
-DHALF_BRO_INCOM_WEBKIT2=ON
|
"-DCMAKE_BUILD_TYPE=Release"
|
||||||
-DUSE_ZEITGEIST=OFF
|
"-DUSE_ZEITGEIST=OFF"
|
||||||
'';
|
"-DHALF_BRO_INCOM_WEBKIT2=OFF"
|
||||||
|
"-DUSE_GTK3=1"
|
||||||
|
];
|
||||||
|
|
||||||
NIX_LDFLAGS="-lX11";
|
NIX_LDFLAGS="-lX11";
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user