Unverified Commit 91c84766 authored by Peder Bergebakken Sundt's avatar Peder Bergebakken Sundt Committed by GitHub
Browse files

ddev: fix embedded version, use versionCheckHook (#443090)

parents d84ffcc6 f4051a29
Loading
Loading
Loading
Loading
+11 −13
Original line number Diff line number Diff line
@@ -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";