public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

netsurf: Removes unneeded things 

Also fixes native build inputs
This commit is contained in:
Samuel Dionne-Riel 2019-08-03 00:27:36 -04:00
parent d53399e1b3
commit 53d094bc8b
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/applications/misc/netsurf/browser/default.nix
View File

@ -1,9 +1,8 @@
{ stdenv, fetchurl, fetchpatch, pkgconfig, libpng, openssl, curl, gtk2, check, SDL { stdenv, fetchurl, fetchpatch, pkgconfig, libpng, openssl, curl, gtk2, check, SDL
, libxml2, libidn, perl, nettools, perlPackages, xxd
, libXcursor, libXrandr, makeWrapper , libXcursor, libXrandr, makeWrapper
, libwebp , libwebp
, libxml2, libidn, perl, perlPackages, xxd
, uilib ? "framebuffer" , uilib ? "framebuffer"
, buildsystem
, nsgenbind , nsgenbind
, libnsfb , libnsfb
, libwapcaplet , libwapcaplet
@ -26,8 +25,6 @@ stdenv.mkDerivation rec {
name = "netsurf-${version}"; name = "netsurf-${version}";
version = "3.9"; version = "3.9";
# UI libs incldue Framebuffer, and gtk
src = fetchurl { src = fetchurl {
url = "http://download.netsurf-browser.org/netsurf/releases/source/netsurf-${version}-src.tar.gz"; url = "http://download.netsurf-browser.org/netsurf/releases/source/netsurf-${version}-src.tar.gz";
sha256 = "1hzcm2s2wh5sapgr000lg63hcdbj6hyajxl43xa1x80kc5piqbyp"; sha256 = "1hzcm2s2wh5sapgr000lg63hcdbj6hyajxl43xa1x80kc5piqbyp";
@ -43,16 +40,17 @@ stdenv.mkDerivation rec {
]; ];
nativeBuildInputs = [ nativeBuildInputs = [
perl
perlPackages.HTMLParser
pkgconfig pkgconfig
xxd xxd
] ++ stdenv.lib.optionals (uilib == "gtk") [ ] ++ stdenv.lib.optionals (uilib == "gtk") [
wrapGAppsHook wrapGAppsHook
]; ];
buildInputs = [ libpng openssl curl gtk2 check libxml2 libidn perl buildInputs = [ libpng openssl curl gtk2 check libxml2 libidn
nettools perlPackages.HTMLParser libXcursor libXrandr makeWrapper SDL libXcursor libXrandr makeWrapper SDL
libwebp libwebp
buildsystem
nsgenbind nsgenbind
libnsfb libnsfb
libwapcaplet libwapcaplet
@ -78,7 +76,6 @@ stdenv.mkDerivation rec {
makeFlags = [ makeFlags = [
"PREFIX=$(out)" "PREFIX=$(out)"
"NSSHARED=${buildsystem}/share/netsurf-buildsystem"
"TARGET=${uilib}" "TARGET=${uilib}"
]; ];