diff options
| author | Izorkin <izorkin@elven.pw> | 2023-11-20 22:51:21 +0300 |
|---|---|---|
| committer | Izorkin <izorkin@elven.pw> | 2023-12-17 16:51:29 +0300 |
| commit | 00cb53de4fa2ba9fcdb52f504943d6ec8ebe5ce5 (patch) | |
| tree | cbde498944cda6d9e30cfcd7dbbcd8e87eca00cc /pkgs/servers/http | |
| parent | e9b7a386120656f13c4a2bab676e81056f97171d (diff) | |
| download | nixlib-00cb53de4fa2ba9fcdb52f504943d6ec8ebe5ce5.tar nixlib-00cb53de4fa2ba9fcdb52f504943d6ec8ebe5ce5.tar.gz nixlib-00cb53de4fa2ba9fcdb52f504943d6ec8ebe5ce5.tar.bz2 nixlib-00cb53de4fa2ba9fcdb52f504943d6ec8ebe5ce5.tar.lz nixlib-00cb53de4fa2ba9fcdb52f504943d6ec8ebe5ce5.tar.xz nixlib-00cb53de4fa2ba9fcdb52f504943d6ec8ebe5ce5.tar.zst nixlib-00cb53de4fa2ba9fcdb52f504943d6ec8ebe5ce5.zip | |
nginx: fix nginx binary pathname
Diffstat (limited to 'pkgs/servers/http')
| -rw-r--r-- | pkgs/servers/http/nginx/generic.nix | 3 | ||||
| -rw-r--r-- | pkgs/servers/http/openresty/default.nix | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix index 4ca4bd75d6b6..5963d8c9745f 100644 --- a/pkgs/servers/http/nginx/generic.nix +++ b/pkgs/servers/http/nginx/generic.nix @@ -68,6 +68,7 @@ stdenv.mkDerivation { ++ mapModules "inputs"; configureFlags = [ + "--sbin-path=bin/nginx" "--with-http_ssl_module" "--with-http_v2_module" "--with-http_realip_module" @@ -184,7 +185,7 @@ stdenv.mkDerivation { postInstall = let - noSourceRefs = lib.concatMapStrings (m: "remove-references-to -t ${m.src} $out/sbin/nginx\n") modules; + noSourceRefs = lib.concatMapStrings (m: "remove-references-to -t ${m.src} $out/bin/nginx\n") modules; in noSourceRefs + postInstall; passthru = { diff --git a/pkgs/servers/http/openresty/default.nix b/pkgs/servers/http/openresty/default.nix index 433d8fd3969b..971c1e28cdb0 100644 --- a/pkgs/servers/http/openresty/default.nix +++ b/pkgs/servers/http/openresty/default.nix @@ -41,7 +41,7 @@ callPackage ../nginx/generic.nix args rec { postInstall = '' ln -s $out/luajit/bin/luajit-2.1.0-beta3 $out/bin/luajit-openresty - ln -s $out/nginx/sbin/nginx $out/bin/nginx + ln -s $out/nginx/bin/nginx $out/bin/nginx ln -s $out/nginx/conf $out/conf ln -s $out/nginx/html $out/html ''; |