diff options
| author | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2022-12-19 08:37:40 +0100 |
|---|---|---|
| committer | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2022-12-19 08:38:48 +0100 |
| commit | 7f2d5f369ce7a386c51c505dc08e21a8e94255f4 (patch) | |
| tree | f4a31c2719084d64e1d1ed56cc9534aba910a436 /pkgs/servers/http/nginx/generic.nix | |
| parent | 76672661b9b8cf731e2cd87984f701937e8df655 (diff) | |
openresty: 1.19.9 -> 1.21.4
Diffstat (limited to 'pkgs/servers/http/nginx/generic.nix')
| -rw-r--r-- | pkgs/servers/http/nginx/generic.nix | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix index a18b771aa1c37..67e08a66695c1 100644 --- a/pkgs/servers/http/nginx/generic.nix +++ b/pkgs/servers/http/nginx/generic.nix @@ -18,9 +18,11 @@ outer@{ lib, stdenv, fetchurl, fetchpatch, openssl, zlib, pcre, libxml2, libxslt , src ? null # defaults to upstream nginx ${version} , sha256 ? null # when not specifying src , configureFlags ? [] +, nativeBuildInputs ? [] , buildInputs ? [] , extraPatches ? [] , fixPatch ? p: p +, postPatch ? "" , preConfigure ? "" , postInstall ? "" , meta ? null @@ -48,9 +50,7 @@ assert assertMsg (unique moduleNames == moduleNames) "nginx: duplicate modules: ${concatStringsSep ", " moduleNames}. A common cause for this is that services.nginx.additionalModules adds a module which the nixos module itself already adds."; stdenv.mkDerivation { - inherit pname; - inherit version; - inherit nginxVersion; + inherit pname version nginxVersion; outputs = ["out" "doc"]; @@ -59,6 +59,9 @@ stdenv.mkDerivation { inherit sha256; }; + nativeBuildInputs = [ removeReferencesTo ] + ++ nativeBuildInputs; + buildInputs = [ openssl zlib pcre libxml2 libxslt gd geoip perl ] ++ buildInputs ++ mapModules "inputs"; @@ -155,6 +158,8 @@ stdenv.mkDerivation { ] ++ mapModules "patches") ++ extraPatches; + inherit postPatch; + hardeningEnable = optional (!stdenv.isDarwin) "pie"; enableParallelBuilding = true; @@ -164,8 +169,6 @@ stdenv.mkDerivation { cp -r ${nginx-doc}/* $doc ''; - nativeBuildInputs = [ removeReferencesTo ]; - disallowedReferences = map (m: m.src) modules; postInstall = |