commit 829014a2d00615627335727b10c3c47e82a1427d · pyrox.dev/nixpkgs

+15 -5

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

···

       25
       25
        
         xxd,

     

       26
       26
        
       

     

       27
       27
        
         # Netsurf-specific dependencies

     

       28
       28
       -
         buildsystem,

     

       28
       28
       +
         netsurf-buildsystem,

     

       29
       29
        
         libcss,

     

       30
       30
        
         libdom,

     

       31
       31
        
         libhubbub,

     
···

       42
       42
        
         nsgenbind,

     

       43
       43
        
       

     

       44
       44
        
         # Configuration

     

       45
       45
       -
         uilib,

     

       45
       45
       +
         uilib ? "gtk3",

     

       46
       46
        
       }:

     

       47
       47
       +
       

     

       48
       48
       +
       assert lib.assertOneOf "uilib" uilib [

     

       49
       49
       +
         "framebuffer"

     

       50
       50
       +
         "gtk2"

     

       51
       51
       +
         "gtk3"

     

       52
       52
       +
       ];

     

       47
       53
        
       

     

       48
       54
        
       stdenv.mkDerivation (finalAttrs: {

     

       49
       55
        
         pname = "netsurf";

     
···

       76
       82
        
           libwebp

     

       77
       83
        
           libxml2

     

       78
       84
        
           openssl

     

       79
       79
       -
       

     

       80
       85
        
           libcss

     

       81
       86
        
           libdom

     

       82
       87
        
           libhubbub

     

       83
       88
        
           libnsbmp

     

       84
       84
       -
           libnsfb

     

       89
       89
       +
           (libnsfb.override {

     

       90
       90
       +
             inherit

     

       91
       91
       +
               SDL

     

       92
       92
       +
               uilib

     

       93
       93
       +
               ;

     

       94
       94
       +
           })

     

       85
       95
        
           libnsgif

     

       86
       96
        
           libnslog

     

       87
       97
        
           libnspsl

     
···

       147
       157
        
             capable of handling many of the web standards in use today.

     

       148
       158
        
           '';

     

       149
       159
        
           license = lib.licenses.gpl2Only;

     

       150
       150
       -
           inherit (buildsystem.meta) maintainers platforms;

     

       160
       160
       +
           inherit (netsurf-buildsystem.meta) maintainers platforms;

     

       151
       161
        
         };

     

       152
       162
        
       })

+1 -1

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

···

       25
       25
        
             }

     

       26
       26
        
             .${self.ui} or null;

     

       27
       27
        
       

     

       28
       28
       -
           browser = callPackage ./browser.nix { };

     

       28
       28
       +
           browser = pkgs.netsurf-browser;

     

       29
       29
        
       

     

       30
       30
        
           buildsystem = pkgs.netsurf-buildsystem;

     

       31
       31
        
           libcss = pkgs.libcss;

-1

pkgs/top-level/all-packages.nix

···

       3394
       3394
        
         };

     

       3395
       3395
        
       

     

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

     

       3397
       3397
       -
         netsurf-browser = netsurf.browser;

     

       3398
       3397
        
       

     

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

     

       3400
       3399
        
           sbcl = sbcl_2_4_6;