lol
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

netsurf: enable sixel display

+21 -16
+10 -13
pkgs/applications/misc/netsurf/browser/default.nix
··· 1 - { stdenv, fetchurl, pkgconfig, libpng, openssl, curl, gtk2, check 1 + { stdenv, fetchurl, pkgconfig, libpng, openssl, curl, gtk2, check, SDL 2 2 , libxml2, libidn, perl, nettools, perlPackages 3 3 , libXcursor, libXrandr, makeWrapper 4 + , uilib ? "framebuffer" 4 5 , buildsystem 5 6 , nsgenbind 6 7 , libnsfb ··· 20 21 name = "netsurf-${version}"; 21 22 version = "3.5"; 22 23 23 - # UIS incldue Framebuffer, and gtk, but 24 - # Framebuffer is buggy. To enable, make sure 25 - # to also build netsurf-libnsfb with ui=framebuffer 26 - # and switch the ui here to framebuffer 27 - ui = "gtk"; 24 + # UI libs incldue Framebuffer, and gtk 28 25 29 26 src = fetchurl { 30 27 url = "http://download.netsurf-browser.org/netsurf/releases/source/netsurf-${version}-src.tar.gz"; ··· 32 29 }; 33 30 34 31 buildInputs = [ pkgconfig libpng openssl curl gtk2 check libxml2 libidn perl 35 - nettools perlPackages.HTMLParser libXcursor libXrandr makeWrapper 32 + nettools perlPackages.HTMLParser libXcursor libXrandr makeWrapper SDL 36 33 buildsystem 37 34 nsgenbind 38 35 libnsfb ··· 49 46 50 47 preConfigure = '' 51 48 cat <<EOF > Makefile.conf 52 - override NETSURF_GTK_RESOURCES := $out/share/Netsurf/${ui}/res 49 + override NETSURF_GTK_RESOURCES := $out/share/Netsurf/${uilib}/res 53 50 override NETSURF_USE_GRESOURCE := YES 54 51 EOF 55 52 ''; ··· 57 54 makeFlags = [ 58 55 "PREFIX=$(out)" 59 56 "NSSHARED=${buildsystem}/share/netsurf-buildsystem" 60 - "TARGET=${ui}" 57 + "TARGET=${uilib}" 61 58 ]; 62 59 63 60 installPhase = '' 64 - mkdir -p $out/bin $out/share/Netsurf/${ui} 65 - cmd=$(case "${ui}" in framebuffer) echo nsfb;; gtk) echo nsgtk;; esac) 61 + mkdir -p $out/bin $out/share/Netsurf/${uilib} 62 + cmd=$(case "${uilib}" in framebuffer) echo nsfb;; gtk) echo nsgtk;; esac) 66 63 cp $cmd $out/bin/netsurf 67 - wrapProgram $out/bin/netsurf --set NETSURFRES $out/share/Netsurf/${ui}/res 68 - tar -hcf - ${ui}/res | (cd $out/share/Netsurf/ && tar -xvpf -) 64 + wrapProgram $out/bin/netsurf --set NETSURFRES $out/share/Netsurf/${uilib}/res 65 + tar -hcf - ${uilib}/res | (cd $out/share/Netsurf/ && tar -xvpf -) 69 66 ''; 70 67 71 68 meta = with stdenv.lib; {
+3 -3
pkgs/applications/misc/netsurf/libnsfb/default.nix
··· 1 - { stdenv, fetchurl, pkgconfig, ui? "gtk" 1 + { stdenv, fetchurl, pkgconfig, uilib? "framebuffer", SDL 2 2 , buildsystem 3 3 }: 4 4 ··· 13 13 sha256 = "176f8why9gzbaca9nnxjqasl02qzc6g507z5w3dzkcjifnkz4mzl"; 14 14 }; 15 15 16 - buildInputs = [ pkgconfig buildsystem ]; 16 + buildInputs = [ pkgconfig buildsystem SDL ]; 17 17 18 18 makeFlags = [ 19 19 "PREFIX=$(out)" 20 20 "NSSHARED=${buildsystem}/share/netsurf-buildsystem" 21 - "TARGET=${ui}" 21 + "TARGET=${uilib}" 22 22 ]; 23 23 24 24 meta = with stdenv.lib; {
+8
pkgs/top-level/all-packages.nix
··· 2207 2207 netdata = callPackage ../tools/system/netdata { }; 2208 2208 2209 2209 netsurf = recurseIntoAttrs (let callPackage = newScope pkgs.netsurf; in rec { 2210 + # ui could be gtk, sixel or framebuffer. Note that console display (sixel) 2211 + # requires a terminal that supports `sixel` capabilities such as mlterm 2212 + # or xterm -ti 340 2213 + ui = "sixel"; 2214 + 2215 + uilib = if ui == "gtk" then "gtk" else "framebuffer"; 2216 + 2217 + SDL = if ui == "gtk" then null else if ui == "sixel" then SDL_sixel else SDL; 2210 2218 2211 2219 buildsystem = callPackage ../applications/misc/netsurf/buildsystem { }; 2212 2220