Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
This renders surf-webkit2 obsolete; it is now aliased to surf.
- Loading branch information
Showing
4 changed files
with
17 additions
and
68 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,42 +1,36 @@ | ||
{stdenv, fetchurl, makeWrapper, gtk2, webkit, pkgconfig, glib, glib_networking, libsoup, gsettings_desktop_schemas, patches ? null}: | ||
{ stdenv, fetchurl | ||
, pkgconfig, wrapGAppsHook | ||
, glib, glib_networking, gsettings_desktop_schemas, gtk, libsoup, webkitgtk | ||
, patches ? null | ||
}: | ||
|
||
stdenv.mkDerivation rec { | ||
name = "surf-${version}"; | ||
version="0.7"; | ||
version = "2.0"; | ||
|
||
src = fetchurl { | ||
url = "http://dl.suckless.org/surf/surf-${version}.tar.gz"; | ||
sha256 = "0jj93izd8fizxfa6ln9w1h9bwki81sz5dhskh5x1rl34zd38aq4m"; | ||
sha256 = "07cmajyafljigy10d21kkyvv5jf3hxkx06pz3rwwk3y3c9x4rvps"; | ||
}; | ||
|
||
buildInputs = [ gtk2 makeWrapper webkit gsettings_desktop_schemas pkgconfig glib libsoup ]; | ||
nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; | ||
buildInputs = [ glib glib_networking gsettings_desktop_schemas gtk libsoup webkitgtk ]; | ||
|
||
# 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''; | ||
installFlags = [ "PREFIX=/" "DESTDIR=$(out)" ]; | ||
|
||
preFixup = '' | ||
wrapProgram "$out/bin/surf" \ | ||
--prefix GIO_EXTRA_MODULES : ${glib_networking.out}/lib/gio/modules \ | ||
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" | ||
''; | ||
|
||
meta = { | ||
description = "Simple web browser"; | ||
meta = with stdenv.lib; { | ||
description = "A simple web browser based on WebKit/GTK+"; | ||
longDescription = '' | ||
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 = stdenv.lib.licenses.mit; | ||
platforms = stdenv.lib.platforms.linux; | ||
license = licenses.mit; | ||
platforms = webkitgtk.meta.platforms; | ||
maintainers = with maintainers; [ joachifm ]; | ||
}; | ||
} |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters