Author: raskin Date: Sun Mar 25 11:22:32 2012 New Revision: 33400 URL: https://nixos.org/websvn/nix/?rev=33400&sc=1
Log: Update/fix Midori Modified: nixpkgs/branches/glib-2.30-take2/pkgs/applications/networking/browsers/midori/default.nix nixpkgs/branches/glib-2.30-take2/pkgs/top-level/all-packages.nix Modified: nixpkgs/branches/glib-2.30-take2/pkgs/applications/networking/browsers/midori/default.nix ============================================================================== --- nixpkgs/branches/glib-2.30-take2/pkgs/applications/networking/browsers/midori/default.nix Sat Mar 24 22:59:08 2012 (r33399) +++ nixpkgs/branches/glib-2.30-take2/pkgs/applications/networking/browsers/midori/default.nix Sun Mar 25 11:22:32 2012 (r33400) @@ -5,10 +5,10 @@ doPatchShebangs = args.doPatchShebangs; makeManyWrappers = args.makeManyWrappers; - version = "0.2"; - release = "7"; + version = "0.4"; + release = "4"; buildInputs = with args; [ - intltool python imagemagick gtk glib webkit libxml2 + 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 @@ -17,16 +17,20 @@ rec { src = fetchurl { url = "http://archive.xfce.org/src/apps/midori/${version}/midori-${version}.${release}.tar.bz2"; - sha256 = "b1dcc479ceb938c8d9cdea098c8d72d563bce5010c27fbcaa4c992d10f2d809c"; + sha256 = "fadd43f76c1c9f6a16483e60a804e58fb6817c6a595b1acdd59bcbdd7b35bca2"; }; inherit buildInputs; - configureFlags = []; + configureFlags = ["--enable-gtk3"]; /* doConfigure should be specified separately */ - phaseNames = ["doUnpack" "shebangsHere" "doConfigure" + phaseNames = ["doUnpack" "setVars" "shebangsHere" "doConfigure" "doMakeInstall" "shebangsInstalled" "wrapWK" ]; + + setVars = args.fullDepEntry '' + export NIX_LDFLAGS="$NIX_LDFLAGS -lnotify" + '' []; shebangsHere = (doPatchShebangs "."); shebangsInstalled = (doPatchShebangs "$out/bin"); Modified: nixpkgs/branches/glib-2.30-take2/pkgs/top-level/all-packages.nix ============================================================================== --- nixpkgs/branches/glib-2.30-take2/pkgs/top-level/all-packages.nix Sat Mar 24 22:59:08 2012 (r33399) +++ nixpkgs/branches/glib-2.30-take2/pkgs/top-level/all-packages.nix Sun Mar 25 11:22:32 2012 (r33400) @@ -6991,7 +6991,7 @@ inherit imagemagick intltool python pkgconfig webkit libxml2 which gettext makeWrapper file libidn sqlite docutils libnotify vala dbus_glib; - inherit gtk glib; + inherit gtk3 glib; inherit (gnome) gtksourceview; inherit (webkit.passthru.args) libsoup; inherit (xlibs) kbproto xproto libXScrnSaver scrnsaverproto; _______________________________________________ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits