diff --git a/pkgs/by-name/fr/frankenphp/package.nix b/pkgs/by-name/fr/frankenphp/package.nix index 6d2578e3cf39..e6e2cecfe19e 100644 --- a/pkgs/by-name/fr/frankenphp/package.nix +++ b/pkgs/by-name/fr/frankenphp/package.nix @@ -6,7 +6,6 @@ php, brotli, watcher, - frankenphp, cctools, darwin, libiconv, @@ -29,18 +28,18 @@ let phpConfig = "${phpUnwrapped.dev}/bin/php-config"; pieBuild = stdenv.hostPlatform.isMusl; in -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "frankenphp"; version = "1.11.1"; src = fetchFromGitHub { owner = "php"; repo = "frankenphp"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-JzZXg/tkSZqLZn56RyLb8Q8SaeG/tHA8Sqxu99s5ks0="; }; - sourceRoot = "${src.name}/caddy"; + sourceRoot = "${finalAttrs.src.name}/caddy"; # frankenphp requires C code that would be removed with `go mod tidy` # https://github.com/golang/go/issues/26366 @@ -78,14 +77,14 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X 'github.com/caddyserver/caddy/v2.CustomVersion=FrankenPHP ${version} PHP ${phpUnwrapped.version} Caddy'" + "-X 'github.com/caddyserver/caddy/v2.CustomVersion=FrankenPHP ${finalAttrs.version} PHP ${phpUnwrapped.version} Caddy'" # pie mode is only available with pkgsMusl, it also automatically add -buildmode=pie to $GOFLAGS ] ++ (lib.optional pieBuild [ "-static-pie" ]); preBuild = '' export CGO_CFLAGS="$(${phpConfig} --includes)" - export CGO_LDFLAGS="-DFRANKENPHP_VERSION=${version} \ + export CGO_LDFLAGS="-DFRANKENPHP_VERSION=${finalAttrs.version} \ $(${phpConfig} --ldflags) \ $(${phpConfig} --libs)" ''; @@ -115,13 +114,13 @@ buildGoModule rec { ''; } '' - ${lib.getExe frankenphp} php-cli $phpScript > $out + ${lib.getExe finalAttrs.finalPackage} php-cli $phpScript > $out ''; }; }; meta = { - changelog = "https://github.com/php/frankenphp/releases/tag/v${version}"; + changelog = "https://github.com/php/frankenphp/releases/tag/v${finalAttrs.version}"; description = "Modern PHP app server"; homepage = "https://github.com/php/frankenphp"; license = lib.licenses.mit; @@ -129,4 +128,4 @@ buildGoModule rec { maintainers = [ lib.maintainers.piotrkwiecinski ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; }; -} +})