Commit 829014a2 authored by jopejoe1's avatar jopejoe1
Browse files

netsurf-browser: move to by-name

parent 279c298c

pkgs/applications/networking/browsers/netsurf/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ lib.makeScope pkgs.newScope ( 
      }

      .${self.ui} or null;



    browser = callPackage ./browser.nix { };

    browser = pkgs.netsurf-browser;



    buildsystem = pkgs.netsurf-buildsystem;

    libcss = pkgs.libcss;

pkgs/applications/networking/browsers/netsurf/browser.nix→pkgs/by-name/ne/netsurf-browser/package.nix

+15 −5
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
  xxd,



  # Netsurf-specific dependencies

  buildsystem,

  netsurf-buildsystem,

  libcss,

  libdom,

  libhubbub,
@@ -42,9 +42,15 @@ 
  nsgenbind,



  # Configuration

  uilib,

  uilib ? "gtk3",

}:



assert lib.assertOneOf "uilib" uilib [

  "framebuffer"

  "gtk2"

  "gtk3"

];



stdenv.mkDerivation (finalAttrs: {

  pname = "netsurf";

  version = "3.11";
@@ -76,12 +82,16 @@ stdenv.mkDerivation (finalAttrs: { 
    libwebp

    libxml2

    openssl



    libcss

    libdom

    libhubbub

    libnsbmp

    libnsfb

    (libnsfb.override {

      inherit

        SDL

        uilib

        ;

    })

    libnsgif

    libnslog

    libnspsl
@@ -147,6 +157,6 @@ stdenv.mkDerivation (finalAttrs: { 
      capable of handling many of the web standards in use today.

    '';

    license = lib.licenses.gpl2Only;

    inherit (buildsystem.meta) maintainers platforms;

    inherit (netsurf-buildsystem.meta) maintainers platforms;

  };

})

pkgs/top-level/all-packages.nix

+0 −1
Original line number Diff line number Diff line
@@ -3394,7 +3394,6 @@ with pkgs; 
  };



  netsurf = recurseIntoAttrs (callPackage ../applications/networking/browsers/netsurf { });

  netsurf-browser = netsurf.browser;



  nyxt = callPackage ../applications/networking/browsers/nyxt {

    sbcl = sbcl_2_4_6;