Unverified Commit 481660ff authored by John Ericson's avatar John Ericson Committed by GitHub
Browse files

freebsd.{geom,libgeom,libbsdxml}: split outputs and improve docs (#389696)

parents 09393521 9543cc5e

pkgs/os-specific/bsd/freebsd/pkgs/geom.nix

+18 −0
Original line number Diff line number Diff line 
{

  lib,

  mkDerivation,

  libgeom,

  libufs,
@@ -18,6 +19,12 @@ let 
      "sys/opencrypto"

    ];



    outputs = [

      "out"

      "man"

      "debug"

    ];



    # libgeom needs sbuf and bsdxml but linker doesn't know that

    buildInputs = [

      libgeom
@@ -37,8 +44,19 @@ mkDerivation { 
    "lib/Makefile.inc"

    "lib/geom"

  ];

  outputs = [

    "out"

    "man"

    "debug"

  ];



  GEOM_CLASS_DIR = "${libs}/lib";



  # link in man pages from libs

  postInstall = ''

    mkdir -p $man/share/man/man8

    ln -s ${lib.getMan libs}/share/man/man8/*.8* $man/share/man/man8/

  '';



  buildInputs = [ libgeom ];

}

pkgs/os-specific/bsd/freebsd/pkgs/libbsdxml.nix

+4 −0
Original line number Diff line number Diff line
@@ -3,4 +3,8 @@ mkDerivation { 
  path = "lib/libexpat";

  extraPaths = [ "contrib/expat" ];

  buildInputs = [ ];

  outputs = [

    "out"

    "debug"

  ];

}

pkgs/os-specific/bsd/freebsd/pkgs/libgeom.nix

+7 −0
Original line number Diff line number Diff line
@@ -5,6 +5,13 @@ 
}:

mkDerivation {

  path = "lib/libgeom";



  outputs = [

    "out"

    "man"

    "debug"

  ];



  buildInputs = [

    libbsdxml

    libsbuf