From d3995fdb38cbc181d7e95ba8aebe93ff99a1694b Mon Sep 17 00:00:00 2001 From: David Guibert Date: Thu, 11 Aug 2011 16:33:41 +0000 Subject: [PATCH] surf: version 0.4.1 svn path=/nixpkgs/trunk/; revision=28496 --- pkgs/applications/misc/surf/default.nix | 29 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 7 ++++++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/applications/misc/surf/default.nix diff --git a/pkgs/applications/misc/surf/default.nix b/pkgs/applications/misc/surf/default.nix new file mode 100644 index 00000000000..6d9072e48b4 --- /dev/null +++ b/pkgs/applications/misc/surf/default.nix @@ -0,0 +1,29 @@ +{stdenv, fetchurl, gtk, webkit, pkgconfig, glib, libsoup, patches ? null}: + +stdenv.mkDerivation rec { + name = "surf-${version}"; + version="0.4.1"; + + src = fetchurl { + url = "http://dl.suckless.org/surf/surf-${version}.tar.gz"; + sha256 = "0im5psjw0r8av3zjyy2wqcl6y5ylwnrab5kfcwc23bsbx2irnw4k"; + }; + + buildInputs = [ gtk webkit pkgconfig glib libsoup ]; + + # Allow users set their own list of patches + inherit patches; + + buildPhase = " make "; + +# `-lX11' to make sure libX11's store path is in the RPATH + NIX_LDFLAGS = "-lX11"; + preConfigure = [ ''sed -i "s@PREFIX = /usr/local@PREFIX = $out@g" config.mk'' ]; + + meta = { + description = "surf is a simple web browser based on WebKit/GTK+. It is able to display websites and follow links. It supports the XEmbed protocol which makes it possible to embed it in another application. Furthermore, one can point surf to another URI by setting its XProperties."; + homepage = http://surf.suckless.org; + license = "MIT"; + platforms = with stdenv.lib.platforms; all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6ceb9228999..2feae2eba83 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7176,12 +7176,19 @@ let httpd = apacheHttpd; }; + subversionClient = lowPrio (appendToName "client" (subversion.override { bdbSupport = false; perlBindings = true; pythonBindings = true; })); + + surf = callPackage ../applications/misc/surf { + inherit (gtkLibs) gtk glib; + libsoup = gnome28.libsoup; + }; + svk = perlPackages.SVK; sylpheed = callPackage ../applications/networking/mailreaders/sylpheed {