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

Update Midori

Browse Source 
svn path=/nixpkgs/trunk/; revision=23397
This commit is contained in:
Michael Raskin 2010-08-24 13:58:57 +00:00
parent 68a6fa773a
commit 90603fd593
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,19 +5,19 @@ let
doPatchShebangs = args.doPatchShebangs; doPatchShebangs = args.doPatchShebangs;
makeManyWrappers = args.makeManyWrappers; makeManyWrappers = args.makeManyWrappers;
version = lib.attrByPath ["version"] "0.1.7" args; version = "0.2";
release = "7";
buildInputs = with args; [ buildInputs = with args; [
intltool python imagemagick gtk glib webkit libxml2 intltool python imagemagick gtk glib webkit libxml2
gtksourceview pkgconfig which gettext makeWrapper gtksourceview pkgconfig which gettext makeWrapper
file libidn sqlite docutils libnotify libsoup file libidn sqlite docutils libnotify libsoup vala
kbproto xproto scrnsaverproto libXScrnSaver dbus_glib
]; ];
in in
rec { rec {
src = fetchurl { src = fetchurl {
url = "http://goodies.xfce.org/releases/midori/midori-${version}.tar.bz2"; url = "http://archive.xfce.org/src/apps/midori/${version}/midori-${version}.${release}.tar.bz2";
sha256 = if version == "0.1.7" then sha256 = "b1dcc479ceb938c8d9cdea098c8d72d563bce5010c27fbcaa4c992d10f2d809c";
"1bxs4nlwvhzwiq73lf1gvx7qqdm1hm4x1hym1b0q0dhwhdvafx4v"
else null;
}; };
inherit buildInputs; inherit buildInputs;
@ -32,7 +32,7 @@ rec {
shebangsInstalled = (doPatchShebangs "$out/bin"); shebangsInstalled = (doPatchShebangs "$out/bin");
wrapWK = (makeManyWrappers "$out/bin/*" "--set WEBKIT_IGNORE_SSL_ERRORS 1"); wrapWK = (makeManyWrappers "$out/bin/*" "--set WEBKIT_IGNORE_SSL_ERRORS 1");
name = "midori-" + version; name = "midori-${version}.${release}";
meta = { meta = {
description = "Light WebKit-based web browser with GTK GUI."; description = "Light WebKit-based web browser with GTK GUI.";
maintainers = [args.lib.maintainers.raskin]; maintainers = [args.lib.maintainers.raskin];

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

@ -5815,10 +5815,12 @@ let
midori = builderDefsPackage (import ../applications/networking/browsers/midori) { midori = builderDefsPackage (import ../applications/networking/browsers/midori) {
inherit imagemagick intltool python pkgconfig webkit libxml2 inherit imagemagick intltool python pkgconfig webkit libxml2
which gettext makeWrapper file libidn sqlite docutils libnotify; which gettext makeWrapper file libidn sqlite docutils libnotify
vala dbus_glib;
inherit (gtkLibs) gtk glib; inherit (gtkLibs) gtk glib;
inherit (gnome28) gtksourceview; inherit (gnome28) gtksourceview;
inherit (webkit.passthru.args) libsoup; inherit (webkit.passthru.args) libsoup;
inherit (xlibs) kbproto xproto libXScrnSaver scrnsaverproto;
}; };
minicom = callPackage ../tools/misc/minicom { }; minicom = callPackage ../tools/misc/minicom { };