From 75617407d29877ce877595e77f89e4a7317e6060 Mon Sep 17 00:00:00 2001 From: Thibault Gagnaux Date: Fri, 27 Jan 2023 17:15:00 +0100 Subject: [PATCH 1/3] colima: use lima-bin on darwin for native macOS virtualization support --- pkgs/applications/virtualization/colima/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/colima/default.nix b/pkgs/applications/virtualization/colima/default.nix index d13cfbd7f177..0e0f97562a21 100644 --- a/pkgs/applications/virtualization/colima/default.nix +++ b/pkgs/applications/virtualization/colima/default.nix @@ -1,14 +1,18 @@ { lib +, stdenv , buildGoModule , fetchFromGitHub , installShellFiles , lima +, lima-bin , makeWrapper , qemu , testers , colima }: +let lima-drv = if stdenv.isDarwin then lima-bin else lima; +in buildGoModule rec { pname = "colima"; version = "0.5.2"; @@ -41,7 +45,7 @@ buildGoModule rec { postInstall = '' wrapProgram $out/bin/colima \ - --prefix PATH : ${lib.makeBinPath [ lima qemu ]} + --prefix PATH : ${lib.makeBinPath [ lima-drv qemu ]} installShellCompletion --cmd colima \ --bash <($out/bin/colima completion bash) \ From e75161f4ba591199af1a7bd8fac3d77115b267a1 Mon Sep 17 00:00:00 2001 From: Thibault Gagnaux Date: Sun, 29 Jan 2023 17:15:06 +0100 Subject: [PATCH 2/3] colima: add comment on why we use lima-bin on darwin --- pkgs/applications/virtualization/colima/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/virtualization/colima/default.nix b/pkgs/applications/virtualization/colima/default.nix index 0e0f97562a21..4654b4b56ab4 100644 --- a/pkgs/applications/virtualization/colima/default.nix +++ b/pkgs/applications/virtualization/colima/default.nix @@ -11,6 +11,8 @@ , colima }: +# use lima-bin on darwin to support native macOS virtualization +# https://github.com/NixOS/nixpkgs/pull/209171 let lima-drv = if stdenv.isDarwin then lima-bin else lima; in buildGoModule rec { From 06a3791603d04bd5ca76ff72b40a405e6db291e0 Mon Sep 17 00:00:00 2001 From: tricktron Date: Sun, 5 Feb 2023 13:56:26 +0100 Subject: [PATCH 3/3] colima: make lima derivation configurable Co-authored-by: Weijia Wang <9713184+wegank@users.noreply.github.com> --- pkgs/applications/virtualization/colima/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/virtualization/colima/default.nix b/pkgs/applications/virtualization/colima/default.nix index 4654b4b56ab4..e49c2a659121 100644 --- a/pkgs/applications/virtualization/colima/default.nix +++ b/pkgs/applications/virtualization/colima/default.nix @@ -9,12 +9,11 @@ , qemu , testers , colima + # use lima-bin on darwin to support native macOS virtualization + # https://github.com/NixOS/nixpkgs/pull/209171 +, lima-drv ? if stdenv.isDarwin then lima-bin else lima }: -# use lima-bin on darwin to support native macOS virtualization -# https://github.com/NixOS/nixpkgs/pull/209171 -let lima-drv = if stdenv.isDarwin then lima-bin else lima; -in buildGoModule rec { pname = "colima"; version = "0.5.2";