From cd20e3b85e7fd8c5a3f303634022d7f794ac292b Mon Sep 17 00:00:00 2001 From: Thibault Gagnaux Date: Mon, 6 Mar 2023 09:13:58 +0100 Subject: [PATCH 1/3] colima: patch `sw_vers` on darwin --- pkgs/applications/virtualization/colima/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/virtualization/colima/default.nix b/pkgs/applications/virtualization/colima/default.nix index e49c2a659121..05038f564e3d 100644 --- a/pkgs/applications/virtualization/colima/default.nix +++ b/pkgs/applications/virtualization/colima/default.nix @@ -1,5 +1,6 @@ { lib , stdenv +, darwin , buildGoModule , fetchFromGitHub , installShellFiles @@ -44,6 +45,11 @@ buildGoModule rec { subPackages = [ "cmd/colima" ]; + postPatch = lib.optionalString stdenv.isDarwin '' + substituteInPlace util/util.go \ + --replace 'sw_vers' "${darwin.DarwinTools}/bin/sw_vers" + ''; + postInstall = '' wrapProgram $out/bin/colima \ --prefix PATH : ${lib.makeBinPath [ lima-drv qemu ]} From d23c04cdbd5460ae548803bb10fd04b9da4037a0 Mon Sep 17 00:00:00 2001 From: Thibault Gagnaux Date: Mon, 6 Mar 2023 09:42:37 +0100 Subject: [PATCH 2/3] colima: build and test all packages --- pkgs/applications/virtualization/colima/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/virtualization/colima/default.nix b/pkgs/applications/virtualization/colima/default.nix index 05038f564e3d..f340ebdcd762 100644 --- a/pkgs/applications/virtualization/colima/default.nix +++ b/pkgs/applications/virtualization/colima/default.nix @@ -43,8 +43,6 @@ buildGoModule rec { -X github.com/abiosoft/colima/config.revision=$(cat .git-revision)" ''; - subPackages = [ "cmd/colima" ]; - postPatch = lib.optionalString stdenv.isDarwin '' substituteInPlace util/util.go \ --replace 'sw_vers' "${darwin.DarwinTools}/bin/sw_vers" From 332073ba4277f8643362ccfc6f20b0050549a4b9 Mon Sep 17 00:00:00 2001 From: Thibault Gagnaux Date: Mon, 6 Mar 2023 09:54:01 +0100 Subject: [PATCH 3/3] colima: add darwin tools to native build inputs --- pkgs/applications/virtualization/colima/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/virtualization/colima/default.nix b/pkgs/applications/virtualization/colima/default.nix index f340ebdcd762..481d8408e860 100644 --- a/pkgs/applications/virtualization/colima/default.nix +++ b/pkgs/applications/virtualization/colima/default.nix @@ -32,7 +32,8 @@ buildGoModule rec { ''; }; - nativeBuildInputs = [ installShellFiles makeWrapper ]; + nativeBuildInputs = [ installShellFiles makeWrapper ] + ++ lib.optionals stdenv.isDarwin [ darwin.DarwinTools ]; vendorSha256 = "sha256-Iz1LYL25NpkztTM86zrLwehub8FzO1IlwZqCPW7wDN4="; @@ -43,11 +44,6 @@ buildGoModule rec { -X github.com/abiosoft/colima/config.revision=$(cat .git-revision)" ''; - postPatch = lib.optionalString stdenv.isDarwin '' - substituteInPlace util/util.go \ - --replace 'sw_vers' "${darwin.DarwinTools}/bin/sw_vers" - ''; - postInstall = '' wrapProgram $out/bin/colima \ --prefix PATH : ${lib.makeBinPath [ lima-drv qemu ]}