diff options
| author | zowoq <59103226+zowoq@users.noreply.github.com> | 2022-12-12 11:44:50 +1000 |
|---|---|---|
| committer | zowoq <59103226+zowoq@users.noreply.github.com> | 2022-12-12 12:37:20 +1000 |
| commit | 596fbebaab939de7b499f0cea33809406b142c4b (patch) | |
| tree | 0e87335d6c598046893b1cad5a49246ae07eb505 /pkgs/applications/virtualization | |
| parent | fb83ee7d26bee200b2bd6b69df390c57dee4b6af (diff) | |
podman: add mac-helper patch
Diffstat (limited to 'pkgs/applications/virtualization')
| -rw-r--r-- | pkgs/applications/virtualization/podman/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/applications/virtualization/podman/rm-podman-mac-helper-msg.patch | 16 |
2 files changed, 21 insertions, 0 deletions
diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index dabf52ca88af0..3fed07237f75e 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -27,6 +27,11 @@ buildGoModule rec { sha256 = "sha256-UOAQtGDoZe+Av4+9RQCJiV3//B/pdF0pEsca4FonGxY="; }; + patches = [ + # we intentionally don't build and install the helper so we shouldn't display messages to users about it + ./rm-podman-mac-helper-msg.patch + ]; + vendorSha256 = null; doCheck = false; diff --git a/pkgs/applications/virtualization/podman/rm-podman-mac-helper-msg.patch b/pkgs/applications/virtualization/podman/rm-podman-mac-helper-msg.patch new file mode 100644 index 0000000000000..902a50e4ce24f --- /dev/null +++ b/pkgs/applications/virtualization/podman/rm-podman-mac-helper-msg.patch @@ -0,0 +1,16 @@ +diff --git a/pkg/machine/qemu/machine.go b/pkg/machine/qemu/machine.go +index a6907c0df..717d82ff3 100644 +--- a/pkg/machine/qemu/machine.go ++++ b/pkg/machine/qemu/machine.go +@@ -1483,11 +1483,6 @@ func (v *MachineVM) waitAPIAndPrintInfo(forwardState apiForwardingState, forward + case notInstalled: + fmt.Printf("\nThe system helper service is not installed; the default Docker API socket\n") + fmt.Printf("address can't be used by podman. ") +- if helper := findClaimHelper(); len(helper) > 0 { +- fmt.Printf("If you would like to install it run the\nfollowing commands:\n") +- fmt.Printf("\n\tsudo %s install\n", helper) +- fmt.Printf("\tpodman machine stop%s; podman machine start%s\n\n", suffix, suffix) +- } + case machineLocal: + fmt.Printf("\nAnother process was listening on the default Docker API socket address.\n") + case claimUnsupported: |