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

Update/fix Midori

Browse Source 
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33400
This commit is contained in:
Michael Raskin 2012-03-25 11:22:32 +00:00
parent 318c747520
commit 99f198ab9f
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,10 +5,10 @@ let
doPatchShebangs = args.doPatchShebangs; doPatchShebangs = args.doPatchShebangs;
makeManyWrappers = args.makeManyWrappers; makeManyWrappers = args.makeManyWrappers;
version = "0.2"; version = "0.4";
release = "7"; release = "4";
buildInputs = with args; [ buildInputs = with args; [
intltool python imagemagick gtk glib webkit libxml2 intltool python imagemagick gtk3 glib webkit libxml2
gtksourceview pkgconfig which gettext makeWrapper gtksourceview pkgconfig which gettext makeWrapper
file libidn sqlite docutils libnotify libsoup vala file libidn sqlite docutils libnotify libsoup vala
kbproto xproto scrnsaverproto libXScrnSaver dbus_glib kbproto xproto scrnsaverproto libXScrnSaver dbus_glib
@ -17,16 +17,20 @@ in
rec { rec {
src = fetchurl { src = fetchurl {
url = "http://archive.xfce.org/src/apps/midori/${version}/midori-${version}.${release}.tar.bz2"; url = "http://archive.xfce.org/src/apps/midori/${version}/midori-${version}.${release}.tar.bz2";
sha256 = "b1dcc479ceb938c8d9cdea098c8d72d563bce5010c27fbcaa4c992d10f2d809c"; sha256 = "fadd43f76c1c9f6a16483e60a804e58fb6817c6a595b1acdd59bcbdd7b35bca2";
}; };
inherit buildInputs; inherit buildInputs;
configureFlags = []; configureFlags = ["--enable-gtk3"];
/* doConfigure should be specified separately */ /* doConfigure should be specified separately */
phaseNames = ["doUnpack" "shebangsHere" "doConfigure" phaseNames = ["doUnpack" "setVars" "shebangsHere" "doConfigure"
"doMakeInstall" "shebangsInstalled" "wrapWK" "doMakeInstall" "shebangsInstalled" "wrapWK"
]; ];
setVars = args.fullDepEntry ''
export NIX_LDFLAGS="$NIX_LDFLAGS -lnotify"
'' [];
shebangsHere = (doPatchShebangs "."); shebangsHere = (doPatchShebangs ".");
shebangsInstalled = (doPatchShebangs "$out/bin"); shebangsInstalled = (doPatchShebangs "$out/bin");

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

@ -6991,7 +6991,7 @@ let
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; vala dbus_glib;
inherit gtk glib; inherit gtk3 glib;
inherit (gnome) gtksourceview; inherit (gnome) gtksourceview;
inherit (webkit.passthru.args) libsoup; inherit (webkit.passthru.args) libsoup;
inherit (xlibs) kbproto xproto libXScrnSaver scrnsaverproto; inherit (xlibs) kbproto xproto libXScrnSaver scrnsaverproto;