Merge pull request #310561 from onny/caddy-riscv
caddy: Cross-compilation fix, various enhancements
This commit is contained in:
commit
9d99eed00a
@ -5,6 +5,7 @@
|
|||||||
, caddy
|
, caddy
|
||||||
, testers
|
, testers
|
||||||
, installShellFiles
|
, installShellFiles
|
||||||
|
, stdenv
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
version = "2.7.6";
|
version = "2.7.6";
|
||||||
@ -40,8 +41,13 @@ buildGoModule {
|
|||||||
postInstall = ''
|
postInstall = ''
|
||||||
install -Dm644 ${dist}/init/caddy.service ${dist}/init/caddy-api.service -t $out/lib/systemd/system
|
install -Dm644 ${dist}/init/caddy.service ${dist}/init/caddy-api.service -t $out/lib/systemd/system
|
||||||
|
|
||||||
substituteInPlace $out/lib/systemd/system/caddy.service --replace "/usr/bin/caddy" "$out/bin/caddy"
|
substituteInPlace $out/lib/systemd/system/caddy.service \
|
||||||
substituteInPlace $out/lib/systemd/system/caddy-api.service --replace "/usr/bin/caddy" "$out/bin/caddy"
|
--replace-fail "/usr/bin/caddy" "$out/bin/caddy"
|
||||||
|
substituteInPlace $out/lib/systemd/system/caddy-api.service \
|
||||||
|
--replace-fail "/usr/bin/caddy" "$out/bin/caddy"
|
||||||
|
'' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||||
|
# Generating man pages and completions fail on cross-compilation
|
||||||
|
# https://github.com/NixOS/nixpkgs/issues/308283
|
||||||
|
|
||||||
$out/bin/caddy manpage --directory manpages
|
$out/bin/caddy manpage --directory manpages
|
||||||
installManPage manpages/*
|
installManPage manpages/*
|
@ -4485,10 +4485,6 @@ with pkgs;
|
|||||||
'';
|
'';
|
||||||
});
|
});
|
||||||
|
|
||||||
caddy = callPackage ../servers/caddy { };
|
|
||||||
|
|
||||||
xcaddy = callPackage ../servers/caddy/xcaddy { };
|
|
||||||
|
|
||||||
traefik = callPackage ../servers/traefik { };
|
traefik = callPackage ../servers/traefik { };
|
||||||
|
|
||||||
traefik-certs-dumper = callPackage ../tools/misc/traefik-certs-dumper { };
|
traefik-certs-dumper = callPackage ../tools/misc/traefik-certs-dumper { };
|
||||||
|
Loading…
Reference in New Issue
Block a user