diff options
Diffstat (limited to 'pkgs/applications/networking/browsers')
5 files changed, 21 insertions, 33 deletions
diff --git a/pkgs/applications/networking/browsers/midori/default.nix b/pkgs/applications/networking/browsers/midori/default.nix index 1f4d224e43537..b15c05c7b4939 100644 --- a/pkgs/applications/networking/browsers/midori/default.nix +++ b/pkgs/applications/networking/browsers/midori/default.nix @@ -5,10 +5,10 @@ let 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 @@ in 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"); diff --git a/pkgs/applications/networking/browsers/uzbl/default.nix b/pkgs/applications/networking/browsers/uzbl/default.nix index b21d1862de5d1..b85ad0e085eba 100644 --- a/pkgs/applications/networking/browsers/uzbl/default.nix +++ b/pkgs/applications/networking/browsers/uzbl/default.nix @@ -1,17 +1,20 @@ a : let - fetchurl = a.fetchurl; - - s = import ./src-for-default.nix; + fetchgit = a.fetchgit; buildInputs = with a; [ - libsoup pkgconfig webkit gtk makeWrapper + libsoup pkgconfig webkit gtk3 makeWrapper kbproto ]; in rec { - src = (a.fetchUrlFromSrcInfo s); - inherit (s) name; + src = fetchgit { + url = "https://github.com/Dieterbe/uzbl.git"; + rev = "dcb3b4e1fcff682b412cfe5875f7054b97380d08"; + sha256 = "f7b2b2903c01c9cfbd99bd94783002e1580d8092ff6022bb5aed3f999ff6e468"; + }; + + name = "uzbl-git"; inherit buildInputs; configureFlags = []; diff --git a/pkgs/applications/networking/browsers/uzbl/src-for-default.nix b/pkgs/applications/networking/browsers/uzbl/src-for-default.nix deleted file mode 100644 index 2ffc1f95380cc..0000000000000 --- a/pkgs/applications/networking/browsers/uzbl/src-for-default.nix +++ /dev/null @@ -1,10 +0,0 @@ -rec { - version="2010.04.03"; - name="uzbl-stable-2010.04.03"; - hash="1jxs9agk4jd09v73vl69k3mil4jfr5rhfb0v4sq8sfh1p8nl389s"; - url="http://github.com/Dieterbe/uzbl/tarball/${version}"; - advertisedUrl="http://github.com/Dieterbe/uzbl/tarball/2010.04.03"; - - downloadName="2010.04.03.tar.gz"; - -} diff --git a/pkgs/applications/networking/browsers/uzbl/src-info-for-default.nix b/pkgs/applications/networking/browsers/uzbl/src-info-for-default.nix deleted file mode 100644 index 48650efd146bf..0000000000000 --- a/pkgs/applications/networking/browsers/uzbl/src-info-for-default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ - baseName = "uzbl-stable"; - downloadPage = "http://github.com/Dieterbe/uzbl/downloads"; - sourceRegexp = "/tarball/"; - versionExtractorSedScript = ''s@.*[/]@@''; - versionReferenceCreator = ''$(replaceAllVersionOccurences)''; - extraVars = "downloadName"; - eval_downloadName = ''downloadName=$version.tar.gz''; -} diff --git a/pkgs/applications/networking/browsers/vimprobable2/default.nix b/pkgs/applications/networking/browsers/vimprobable2/default.nix index dad29a278035c..e4494f9565625 100644 --- a/pkgs/applications/networking/browsers/vimprobable2/default.nix +++ b/pkgs/applications/networking/browsers/vimprobable2/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, makeWrapper, perl, pkgconfig, webkit, gtk, libX11, libsoup, +{stdenv, fetchurl, makeWrapper, perl, pkgconfig, webkit_gtk2, gtk, libX11, libsoup, glib_networking}: stdenv.mkDerivation { @@ -7,7 +7,7 @@ stdenv.mkDerivation { url = "mirror://sourceforge/vimprobable/vimprobable2_0.9.12.0.tar.bz2"; sha256 = "1b6xs6rd4rxy9kdsva13bbx7pd2gy159ad8ncd4pplsqr46hw8fb"; }; - buildInputs = [ makeWrapper perl pkgconfig libX11 libsoup webkit gtk ]; + buildInputs = [ makeWrapper perl pkgconfig libX11 libsoup webkit_gtk2 gtk ]; installPhase = '' make PREFIX=/ DESTDIR=$out install wrapProgram "$out/bin/vimprobable2" --prefix GIO_EXTRA_MODULES : \ |