Merge pull request #7975 from samueldr/release-14.12

Fix midori; was building but not working.
This commit is contained in:
Peter Simons 2015-05-24 22:26:30 +02:00
commit 92c52c3297

View File

@ -11,14 +11,18 @@ stdenv.mkDerivation rec {
meta = {
description = "Lightweight WebKitGTK+ web browser";
homepage = "http://www.midori-browser.org";
homepage = "http://midori-browser.org";
license = stdenv.lib.licenses.lgpl21Plus;
platforms = stdenv.lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ raskin iyzsong ];
};
src = fetchurl {
url = "${meta.homepage}/downloads/midori_${version}_all_.tar.bz2";
urls = [
"${meta.homepage}/downloads/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";
sha256 = "10ckm98rfqfbwr84b8mc1ssgj84wjgkr4dadvx2l7c64sigi66dg";
};
@ -26,7 +30,7 @@ stdenv.mkDerivation rec {
buildInputs = [
cmake pkgconfig intltool vala makeWrapper
webkitgtk librsvg libnotify
webkitgtk librsvg libnotify gsettings_desktop_schemas
];
cmakeFlags = ''