midori: update from 0.4.4 to 0.5.6 (close #1411)
This commit is contained in:
parent
46c1216fd0
commit
0889c86b86
|
@ -1,51 +1,37 @@
|
||||||
args :
|
{ stdenv, fetchurl, cmake, pkgconfig, intltool, vala, makeWrapper
|
||||||
let
|
, webkitgtk, librsvg, libnotify
|
||||||
lib = args.lib;
|
, glib_networking, gsettings_desktop_schemas
|
||||||
fetchurl = args.fetchurl;
|
}:
|
||||||
doPatchShebangs = args.doPatchShebangs;
|
|
||||||
makeManyWrappers = args.makeManyWrappers;
|
|
||||||
|
|
||||||
version = "0.4";
|
stdenv.mkDerivation rec {
|
||||||
release = "4";
|
name = "midori-0.5.6";
|
||||||
buildInputs = with args; [
|
|
||||||
intltool python imagemagick gtk3 glib webkit libxml2
|
|
||||||
gtksourceview pkgconfig which gettext makeWrapper
|
|
||||||
file libidn sqlite docutils libnotify libsoup vala
|
|
||||||
kbproto xproto scrnsaverproto libXScrnSaver dbus_glib
|
|
||||||
glib_networking
|
|
||||||
];
|
|
||||||
in
|
|
||||||
rec {
|
|
||||||
src = fetchurl {
|
|
||||||
url = "http://archive.xfce.org/src/apps/midori/${version}/midori-${version}.${release}.tar.bz2";
|
|
||||||
sha256 = "fadd43f76c1c9f6a16483e60a804e58fb6817c6a595b1acdd59bcbdd7b35bca2";
|
|
||||||
};
|
|
||||||
|
|
||||||
inherit buildInputs;
|
|
||||||
configureFlags = ["--enable-gtk3"];
|
|
||||||
|
|
||||||
/* doConfigure should be specified separately */
|
|
||||||
phaseNames = ["doUnpack" "setVars" "shebangsHere" "doConfigure"
|
|
||||||
"doMakeInstall" "shebangsInstalled" "wrapWK"
|
|
||||||
];
|
|
||||||
|
|
||||||
setVars = args.fullDepEntry ''
|
|
||||||
export NIX_LDFLAGS="$NIX_LDFLAGS -lnotify"
|
|
||||||
'' [];
|
|
||||||
|
|
||||||
shebangsHere = (doPatchShebangs ".");
|
|
||||||
shebangsInstalled = (doPatchShebangs "$out/bin");
|
|
||||||
wrapWK = (makeManyWrappers "$out/bin/*"
|
|
||||||
''
|
|
||||||
--set WEBKIT_IGNORE_SSL_ERRORS 1 \
|
|
||||||
--prefix GIO_EXTRA_MODULES : "${args.glib_networking}/lib/gio/modules"
|
|
||||||
'');
|
|
||||||
|
|
||||||
name = "midori-${version}.${release}";
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "Light WebKit-based web browser with GTK GUI";
|
description = "Lightweight WebKitGTK+ web browser";
|
||||||
maintainers = [args.lib.maintainers.raskin];
|
homepage = "http://www.midori-browser.org";
|
||||||
platforms = with args.lib.platforms;
|
license = stdenv.lib.licenses.lgpl21Plus;
|
||||||
linux;
|
platforms = stdenv.lib.platforms.linux;
|
||||||
|
maintainers = with stdenv.lib.maintainers; [ raskin iyzsong ];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
src = fetchurl {
|
||||||
|
url = "${meta.homepage}/downloads/midori_0.5.6_all_.tar.bz2";
|
||||||
|
sha256 = "0jpj8cw0dzamzylzslayamjhv0is0xd99dyaql4nyxrkk5fipgn5";
|
||||||
|
};
|
||||||
|
|
||||||
|
buildInputs = [
|
||||||
|
cmake pkgconfig intltool vala makeWrapper
|
||||||
|
webkitgtk librsvg libnotify
|
||||||
|
];
|
||||||
|
|
||||||
|
cmakeFlags = ''
|
||||||
|
-DUSE_GTK3=1
|
||||||
|
-DUSE_ZEITGEIST=OFF
|
||||||
|
'';
|
||||||
|
|
||||||
|
postInstall = ''
|
||||||
|
wrapProgram $out/bin/midori \
|
||||||
|
--prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \
|
||||||
|
--prefix XDG_DATA_DIRS : "${gsettings_desktop_schemas}/share"
|
||||||
|
'';
|
||||||
}
|
}
|
||||||
|
|
|
@ -8448,15 +8448,7 @@ let
|
||||||
|
|
||||||
mid2key = callPackage ../applications/audio/mid2key { };
|
mid2key = callPackage ../applications/audio/mid2key { };
|
||||||
|
|
||||||
midori = builderDefsPackage (import ../applications/networking/browsers/midori) {
|
midori = callPackage ../applications/networking/browsers/midori { };
|
||||||
inherit imagemagick intltool python pkgconfig webkit libxml2
|
|
||||||
which gettext makeWrapper file libidn sqlite docutils libnotify
|
|
||||||
vala dbus_glib glib_networking;
|
|
||||||
inherit gtk3 glib;
|
|
||||||
inherit (gnome) gtksourceview;
|
|
||||||
inherit (webkit.passthru.args) libsoup;
|
|
||||||
inherit (xlibs) kbproto xproto libXScrnSaver scrnsaverproto;
|
|
||||||
};
|
|
||||||
|
|
||||||
midoriWrapper = wrapFirefox
|
midoriWrapper = wrapFirefox
|
||||||
{ browser = midori; browserName = "midori"; desktopName = "Midori";
|
{ browser = midori; browserName = "midori"; desktopName = "Midori";
|
||||||
|
|
Loading…
Reference in a new issue