Unverified Commit 9c30003e authored by Artturi's avatar Artturi Committed by GitHub
Browse files

Merge pull request #258652 from trofi/nginx-install-manpages

parents e4712e89 c814bbda

pkgs/servers/http/nginx/generic.nix

+12 −4
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ outer@{ lib, stdenv, fetchurl, fetchpatch, openssl, zlib, pcre, libxml2, libxslt 
, nginx-doc



, nixosTests

, substituteAll, removeReferencesTo, gd, geoip, perl

, installShellFiles, substituteAll, removeReferencesTo, gd, geoip, perl

, withDebug ? false

, withKTLS ? false

, withStream ? true
@@ -58,8 +58,10 @@ stdenv.mkDerivation { 
    inherit hash;

  };



  nativeBuildInputs = [ removeReferencesTo ]

    ++ nativeBuildInputs;

  nativeBuildInputs = [

    installShellFiles

    removeReferencesTo

  ] ++ nativeBuildInputs;



  buildInputs = [ openssl zlib pcre libxml2 libxslt gd geoip perl ]

    ++ buildInputs
@@ -166,6 +168,12 @@ stdenv.mkDerivation { 
  preInstall = ''

    mkdir -p $doc

    cp -r ${nginx-doc}/* $doc



    # TODO: make it unconditional when `openresty` and `nginx` are not

    # sharing this code.

    if [[ -e man/nginx.8 ]]; then

      installManPage man/nginx.8

    fi

  '';



  disallowedReferences = map (m: m.src) modules;