From 9438b0412628b4855aa929b3435a7597c2bab51a Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Mon, 28 Sep 2020 02:15:19 -0300 Subject: [PATCH] NetSurf: refactor I will refactor NetSurf to make it more understandable and discoverable. - First, it will be moved from misc/ to networking/browsers/, with all its related libraries; - Second, the expressions will be arranged in a flat directory. --- pkgs/top-level/all-packages.nix | 45 ++------------------------------- 1 file changed, 2 insertions(+), 43 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f410dac2686..c96371c83fb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5047,49 +5047,8 @@ in inherit (darwin.apple_sdk.frameworks) CoreFoundation IOKit; }; - netsurf = recurseIntoAttrs (let callPackage = newScope pkgs.netsurf; in rec { - # ui could be gtk, sixel or framebuffer. Note that console display (sixel) - # requires a terminal that supports `sixel` capabilities such as mlterm - # or xterm -ti 340 - ui = "sixel"; - - uilib = if ui == "gtk" then "gtk" else "framebuffer"; - - SDL = if ui == "gtk" then null else if ui == "sixel" then SDL_sixel else SDL; - - buildsystem = callPackage ../applications/misc/netsurf/buildsystem { }; - - libwapcaplet = callPackage ../applications/misc/netsurf/libwapcaplet { }; - - nsgenbind = callPackage ../applications/misc/netsurf/nsgenbind { }; - - libparserutils = callPackage ../applications/misc/netsurf/libparserutils { }; - - libnslog = callPackage ../applications/misc/netsurf/libnslog { }; - - libcss = callPackage ../applications/misc/netsurf/libcss { }; - - libhubbub = callPackage ../applications/misc/netsurf/libhubbub { }; - - libdom = callPackage ../applications/misc/netsurf/libdom { }; - - libnsbmp = callPackage ../applications/misc/netsurf/libnsbmp { }; - - libnsgif = callPackage ../applications/misc/netsurf/libnsgif { }; - - libnsfb = callPackage ../applications/misc/netsurf/libnsfb { }; - - libnsutils = callPackage ../applications/misc/netsurf/libnsutils { }; - - libsvgtiny = callPackage ../applications/misc/netsurf/libsvgtiny { }; - - libnspsl = callPackage ../applications/misc/netsurf/libnspsl { }; - - libutf8proc = callPackage ../applications/misc/netsurf/libutf8proc { }; - - browser = callPackage ../applications/misc/netsurf/browser { }; - - }); + netsurf = recurseIntoAttrs (callPackage ../applications/networking/browsers/netsurf { }); + netsurf-browser = netsurf.browser; netperf = callPackage ../applications/networking/netperf { };