surf: 0.7 -> 2.0

This renders surf-webkit2 obsolete; it is now aliased to surf.
This commit is contained in:
Joachim Fasting 2017-04-02 19:50:28 +02:00
parent 3490c39f38
commit a77571399d
No known key found for this signature in database
GPG key ID: 7544761007FE4E08
4 changed files with 17 additions and 68 deletions

View file

@ -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 ];
};
}

View file

@ -1,42 +0,0 @@
{ stdenv, fetchzip
, pkgconfig, wrapGAppsHook
, glib, glib_networking, gsettings_desktop_schemas, gtk2, libsoup, webkitgtk
, patches ? null
}:
let
# http://git.suckless.org/surf/log/?h=surf-webkit2
rev = "7e02344a615a61246ccce1c7f770e88fbd57756e";
sha256 = "11f93fbjhl7nfgwkcc45lcm3x1wk5h87ap8fbw9w855021i57pp6";
date = "2017-03-22";
in
stdenv.mkDerivation rec {
name = "surf-webkit2-${date}";
src = fetchzip {
url = "http://git.suckless.org/surf/snapshot/surf-${rev}.tar.gz";
inherit sha256;
};
nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
buildInputs = [ glib glib_networking gsettings_desktop_schemas gtk2 libsoup webkitgtk ];
inherit patches;
installFlags = [ "PREFIX=/" "DESTDIR=$(out)" ];
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 = licenses.mit;
platforms = platforms.all;
maintainers = with maintainers; [ joachifm ];
};
}

View file

@ -121,6 +121,7 @@ doNotDisplayTwice rec {
speedtest_cli = speedtest-cli; # added 2015-02-17
sqliteInteractive = sqlite-interactive; # added 2014-12-06
sshfsFuse = sshfs-fuse; # added 2016-09
surf-webkit2 = surf; # added 2017-04-02
system_config_printer = system-config-printer; # added 2016-01-03
telepathy_qt5 = libsForQt5.telepathy; # added 2015-12-19
tftp_hpa = tftp-hpa; # added 2015-04-03

View file

@ -15561,11 +15561,7 @@ with pkgs;
subunit = callPackage ../development/libraries/subunit { };
surf = callPackage ../applications/networking/browsers/surf {
webkit = webkitgtk2;
};
surf-webkit2 = callPackage ../applications/networking/browsers/surf/webkit2.nix { };
surf = callPackage ../applications/networking/browsers/surf { gtk = gtk2; };
swh_lv2 = callPackage ../applications/audio/swh-lv2 { };