Skip to content

Commit

Permalink
podman: Use path to find gvproxy on Darwin
Browse files Browse the repository at this point in the history
Closes NixOS#141041

Once 4.0.0 is released, there will be an environment variabled
that we can set in the wrapper.  Until then, this allows
`podman machine start` to work on Darwin.
  • Loading branch information
eraserhd committed Jan 27, 2022
1 parent c2f5452 commit e611c73
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 0 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
From f2883a5bfb099f7690518ac612f82aa7f7d30709 Mon Sep 17 00:00:00 2001
From: Jason Felice <[email protected]>
Date: Thu, 27 Jan 2022 13:55:05 -0500
Subject: [PATCH] Look for gvproxy in PATH

---
pkg/machine/qemu/machine.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/machine/qemu/machine.go b/pkg/machine/qemu/machine.go
index ab1b6c7df..866b3d6a5 100644
--- a/pkg/machine/qemu/machine.go
+++ b/pkg/machine/qemu/machine.go
@@ -652,7 +652,7 @@ func (v *MachineVM) startHostNetworking() error {
if err != nil {
return err
}
- binary, err := cfg.FindHelperBinary(machine.ForwarderBinaryName, false)
+ binary, err := cfg.FindHelperBinary(machine.ForwarderBinaryName, true)
if err != nil {
return err
}
--
2.34.1

4 changes: 4 additions & 0 deletions pkgs/applications/virtualization/podman/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,10 @@ buildGoModule rec {
systemd
];

patches = [
./0001-Look-for-gvproxy-in-PATH.patch
];

buildPhase = ''
runHook preBuild
patchShebangs .
Expand Down

0 comments on commit e611c73

Please sign in to comment.