From a9b8ff8c8cae79f4f849840895a85b9f7af55545 Mon Sep 17 00:00:00 2001 From: Morgan Helton Date: Tue, 4 Nov 2025 22:03:03 -0600 Subject: [PATCH 1/2] lima: use pkill from nixpkgs --- pkgs/by-name/li/lima/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/li/lima/package.nix b/pkgs/by-name/li/lima/package.nix index 377a20665201..f4231043c34f 100644 --- a/pkgs/by-name/li/lima/package.nix +++ b/pkgs/by-name/li/lima/package.nix @@ -4,6 +4,7 @@ buildGoModule, callPackage, installShellFiles, + procps, qemu, darwin, makeWrapper, @@ -40,6 +41,11 @@ buildGoModule (finalAttrs: { substituteInPlace Makefile \ --replace-fail 'codesign -f -v --entitlements vz.entitlements -s -' 'codesign -f --entitlements vz.entitlements -s -' \ --replace-fail 'rm -rf _output vendor' 'rm -rf _output' + '' + # fixed upstream, remove when version >=2.0.0 + + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' + substituteInPlace pkg/networks/usernet/recoincile.go \ + --replace-fail '/usr/bin/pkill' '${lib.getExe' procps "pkill"}' ''; # It attaches entitlements with codesign and strip removes those, From cca6685c174cb475db123d7330aa2d18053788ac Mon Sep 17 00:00:00 2001 From: Morgan Helton Date: Tue, 4 Nov 2025 22:05:39 -0600 Subject: [PATCH 2/2] colima: use pkill from nixpkgs --- pkgs/by-name/co/colima/package.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/by-name/co/colima/package.nix b/pkgs/by-name/co/colima/package.nix index 5ab0b0f2fee5..4472f497c25d 100644 --- a/pkgs/by-name/co/colima/package.nix +++ b/pkgs/by-name/co/colima/package.nix @@ -7,6 +7,7 @@ installShellFiles, lima, makeWrapper, + procps, qemu, testers, colima, @@ -43,6 +44,14 @@ buildGoModule rec { env.CGO_ENABLED = 1; + postPatch = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' + substituteInPlace cmd/daemon/daemon.go \ + --replace-fail '/usr/bin/pkill' '${lib.getExe' procps "pkill"}' + + substituteInPlace daemon/process/vmnet/vmnet.go \ + --replace-fail '/usr/bin/pkill' '${lib.getExe' procps "pkill"}' + ''; + preConfigure = '' ldflags="-s -w -X github.com/abiosoft/colima/config.appVersion=${version} \ -X github.com/abiosoft/colima/config.revision=$(cat .git-revision)"