From 68368b6466789e3d79c85d2693fc1c5a9bb1558f Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Mon, 15 Sep 2025 10:18:49 +0200
Subject: [PATCH 1/2] ddev: fix embedded version and testVersion

---
 pkgs/by-name/dd/ddev/package.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/dd/ddev/package.nix b/pkgs/by-name/dd/ddev/package.nix
index 4f16cf3970c8..046e4c8b652e 100644
--- a/pkgs/by-name/dd/ddev/package.nix
+++ b/pkgs/by-name/dd/ddev/package.nix
@@ -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.
@@ -47,11 +47,9 @@ buildGoModule rec {
 
   passthru.tests.version = testers.testVersion {
     package = ddev;
+    version = "ddev version v${version}";
     command = ''
-      # DDEV will try to create $HOME/.ddev, so we set $HOME to a temporary
-      # directory.
-      export HOME=$(mktemp -d)
-      ddev --version
+      HOME=$(mktemp -d) ddev --version
     '';
   };
 

From f4051a29d2e3f73045d38160585c859c6f21913a Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Mon, 15 Sep 2025 23:40:25 +0200
Subject: [PATCH 2/2] ddev: use versionCheckHook

---
 pkgs/by-name/dd/ddev/package.nix | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/dd/ddev/package.nix b/pkgs/by-name/dd/ddev/package.nix
index 046e4c8b652e..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 {
@@ -45,13 +45,13 @@ buildGoModule rec {
       --zsh .gotmp/bin/completions/ddev_zsh_completion.sh
   '';
 
-  passthru.tests.version = testers.testVersion {
-    package = ddev;
-    version = "ddev version v${version}";
-    command = ''
-      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";