Unverified Commit 8ab0a103 authored by dish's avatar dish Committed by GitHub
Browse files

netsurf.*: move to by-name (#393433)

parents b558c287 b36a8544

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

deleted100644 → 0
+0 −46
Original line number Diff line number Diff line 
{ lib, pkgs }:



lib.makeScope pkgs.newScope (

  self:

  let

    inherit (self) callPackage;

  in

  {

    # ui can be: gtk2, gtk3, sixel, framebuffer. Note that console display (sixel)

    # requires a terminal that supports `sixel` capabilities, such as mlterm

    # or xterm -ti 340

    ui = "gtk3";

    uilib =

      {

        "framebuffer" = "framebuffer";

        "gtk2" = "gtk2";

        "gtk3" = "gtk3";

        "sixel" = "framebuffer";

      }

      .${self.ui} or null; # Null will never happen

    SDL =

      {

        "sixel" = pkgs.SDL_sixel;

        "framebuffer" = pkgs.SDL;

      }

      .${self.ui} or null;



    browser = callPackage ./browser.nix { };



    buildsystem = callPackage ./buildsystem.nix { };

    libcss = callPackage ./libcss.nix { };

    libdom = callPackage ./libdom.nix { };

    libhubbub = callPackage ./libhubbub.nix { };

    libnsbmp = callPackage ./libnsbmp.nix { };

    libnsfb = callPackage ./libnsfb.nix { };

    libnsgif = callPackage ./libnsgif.nix { };

    libnslog = callPackage ./libnslog.nix { };

    libnspsl = callPackage ./libnspsl.nix { };

    libnsutils = callPackage ./libnsutils.nix { };

    libparserutils = callPackage ./libparserutils.nix { };

    libsvgtiny = callPackage ./libsvgtiny.nix { };

    libutf8proc = callPackage ./libutf8proc.nix { };

    libwapcaplet = callPackage ./libwapcaplet.nix { };

    nsgenbind = callPackage ./nsgenbind.nix { };

  }

)

pkgs/by-name/im/imv/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
  libjxl,

  libpng,

  librsvg,

  netsurf,

  libnsgif,

  libheif,

}:
@@ -56,9 +56,9 @@ let 
      librsvg

      libheif

      libjxl

      libnsgif

      ;

    libjpeg = libjpeg_turbo;

    inherit (netsurf) libnsgif;

  };



  backendFlags = builtins.map (

pkgs/applications/networking/browsers/netsurf/libcss.nix→pkgs/by-name/li/libcss/package.nix

+5 −5
Original line number Diff line number Diff line
@@ -5,13 +5,13 @@ 
  fetchpatch,

  perl,

  pkg-config,

  buildsystem,

  netsurf-buildsystem,

  libparserutils,

  libwapcaplet,

}:



stdenv.mkDerivation (finalAttrs: {

  pname = "netsurf-libcss";

  pname = "libcss";

  version = "0.9.2";



  src = fetchurl {
@@ -40,14 +40,14 @@ stdenv.mkDerivation (finalAttrs: { 


  buildInputs = [

    perl

    buildsystem

    netsurf-buildsystem

    libparserutils

    libwapcaplet

  ];



  makeFlags = [

    "PREFIX=$(out)"

    "NSSHARED=${buildsystem}/share/netsurf-buildsystem"

    "NSSHARED=${netsurf-buildsystem}/share/netsurf-buildsystem"

  ];



  env.NIX_CFLAGS_COMPILE = toString [
@@ -67,6 +67,6 @@ stdenv.mkDerivation (finalAttrs: { 
      license.

    '';

    license = lib.licenses.mit;

    inherit (buildsystem.meta) maintainers platforms;

    inherit (netsurf-buildsystem.meta) maintainers platforms;

  };

})

pkgs/applications/networking/browsers/netsurf/libdom.nix→pkgs/by-name/li/libdom/package.nix

+5 −5
Original line number Diff line number Diff line
@@ -5,14 +5,14 @@ 
  fetchpatch,

  expat,

  pkg-config,

  buildsystem,

  netsurf-buildsystem,

  libparserutils,

  libwapcaplet,

  libhubbub,

}:



stdenv.mkDerivation (finalAttrs: {

  pname = "netsurf-libdom";

  pname = "libdom";

  version = "0.4.2";



  src = fetchurl {
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { 


  buildInputs = [

    expat

    buildsystem

    netsurf-buildsystem

    libhubbub

    libparserutils

    libwapcaplet
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { 


  makeFlags = [

    "PREFIX=$(out)"

    "NSSHARED=${buildsystem}/share/netsurf-buildsystem"

    "NSSHARED=${netsurf-buildsystem}/share/netsurf-buildsystem"

  ];



  enableParallelBuilding = true;
@@ -56,6 +56,6 @@ stdenv.mkDerivation (finalAttrs: { 
      in other projects under a more permissive license.

    '';

    license = lib.licenses.mit;

    inherit (buildsystem.meta) maintainers platforms;

    inherit (netsurf-buildsystem.meta) maintainers platforms;

  };

})

pkgs/applications/networking/browsers/netsurf/libhubbub.nix→pkgs/by-name/li/libhubbub/package.nix

+5 −5
Original line number Diff line number Diff line
@@ -5,12 +5,12 @@ 
  gperf,

  perl,

  pkg-config,

  buildsystem,

  netsurf-buildsystem,

  libparserutils,

}:



stdenv.mkDerivation (finalAttrs: {

  pname = "netsurf-libhubbub";

  pname = "libhubbub";

  version = "0.3.8";



  src = fetchurl {
@@ -23,13 +23,13 @@ stdenv.mkDerivation (finalAttrs: { 
  buildInputs = [

    gperf

    perl

    buildsystem

    netsurf-buildsystem

    libparserutils

  ];



  makeFlags = [

    "PREFIX=$(out)"

    "NSSHARED=${buildsystem}/share/netsurf-buildsystem"

    "NSSHARED=${netsurf-buildsystem}/share/netsurf-buildsystem"

  ];



  meta = {
@@ -46,6 +46,6 @@ stdenv.mkDerivation (finalAttrs: { 
      content well.

    '';

    license = lib.licenses.mit;

    inherit (buildsystem.meta) maintainers platforms;

    inherit (netsurf-buildsystem.meta) maintainers platforms;

  };

})