forked from NixOS/nixpkgs
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
podman: Use path to find gvproxy on Darwin
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
Showing
2 changed files
with
33 additions
and
0 deletions.
There are no files selected for viewing
25 changes: 25 additions & 0 deletions
25
pkgs/applications/virtualization/podman/0001-Look-for-gvproxy-in-PATH.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters