diff --git a/pkgs/by-name/dd/ddev/package.nix b/pkgs/by-name/dd/ddev/package.nix index 4f16cf3970c8..442a68f2828a 100644 --- a/pkgs/by-name/dd/ddev/package.nix +++ b/pkgs/by-name/dd/ddev/package.nix @@ -4,8 +4,8 @@ buildGoModule, fetchFromGitHub, installShellFiles, - testers, - ddev, + versionCheckHook, + writableTmpDirAsHomeHook, }: buildGoModule rec { @@ -27,8 +27,8 @@ buildGoModule rec { ldflags = [ "-extldflags -static" - "-X github.com/ddev/ddev/pkg/versionconstants.DdevVersion=${version}" - "-X github.com/ddev/ddev/pkg/versionconstants.SegmentKey=${version}" + "-X github.com/ddev/ddev/pkg/versionconstants.DdevVersion=v${version}" + "-X github.com/ddev/ddev/pkg/versionconstants.SegmentKey=v${version}" ]; # Tests need docker. @@ -45,15 +45,13 @@ buildGoModule rec { --zsh .gotmp/bin/completions/ddev_zsh_completion.sh ''; - passthru.tests.version = testers.testVersion { - package = ddev; - command = '' - # DDEV will try to create $HOME/.ddev, so we set $HOME to a temporary - # directory. - export HOME=$(mktemp -d) - ddev --version - ''; - }; + doInstallCheck = true; + nativeInstallCheckInputs = [ + versionCheckHook + writableTmpDirAsHomeHook + ]; + versionCheckProgramArg = "--version"; + versionCheckKeepEnvironment = [ "HOME" ]; meta = with lib; { description = "Docker-based local PHP+Node.js web development environments";