From 24580f4373665d329a7b5cac07e42931f7ca9abc Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Sat, 11 Jul 2026 22:13:17 +0200 Subject: [PATCH 1/5] minikube: Use recommened --replace-fail option with substituteInPlace --- pkgs/by-name/mi/minikube/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/mi/minikube/package.nix b/pkgs/by-name/mi/minikube/package.nix index 1594840e771a..912522f397b1 100644 --- a/pkgs/by-name/mi/minikube/package.nix +++ b/pkgs/by-name/mi/minikube/package.nix @@ -38,14 +38,14 @@ buildGoModule (finalAttrs: { + (lib.optionalString (withQemu && stdenv.hostPlatform.isDarwin) '' substituteInPlace \ pkg/minikube/registry/drvs/qemu2/qemu2.go \ - --replace "/usr/local/opt/qemu/share/qemu" "${qemu}/share/qemu" \ - --replace "/opt/homebrew/opt/qemu/share/qemu" "${qemu}/share/qemu" + --replace-fail "/usr/local/opt/qemu/share/qemu" "${lib.getLib qemu}/share/qemu" \ + --replace-fail "/opt/homebrew/opt/qemu/share/qemu" "${lib.getLib qemu}/share/qemu" '') + (lib.optionalString (withQemu && stdenv.hostPlatform.isLinux) '' substituteInPlace \ pkg/minikube/registry/drvs/qemu2/qemu2.go \ - --replace "/usr/share/OVMF/OVMF_CODE.fd" "${OVMF.firmware}" \ - --replace "/usr/share/AAVMF/AAVMF_CODE.fd" "${OVMF.firmware}" + --replace-fail "/usr/share/OVMF/OVMF_CODE.fd" "${OVMF.firmware}" \ + --replace-fail "/usr/share/AAVMF/AAVMF_CODE.fd" "${OVMF.firmware}" ''); nativeBuildInputs = [ From 901e731042584af2e97bb3b1804e863ea946ea57 Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Sat, 11 Jul 2026 22:14:05 +0200 Subject: [PATCH 2/5] minikube: simplify installation of shell completion --- pkgs/by-name/mi/minikube/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/mi/minikube/package.nix b/pkgs/by-name/mi/minikube/package.nix index 912522f397b1..4a96b87c1aeb 100644 --- a/pkgs/by-name/mi/minikube/package.nix +++ b/pkgs/by-name/mi/minikube/package.nix @@ -78,10 +78,10 @@ buildGoModule (finalAttrs: { } ln -sv $out/bin/minikube $out/bin/kubectl - for shell in bash zsh fish; do - $out/bin/minikube completion $shell > minikube.$shell - installShellCompletion minikube.$shell - done + installShellCompletion --cmd minikube \ + --bash <($out/bin/minikube completion bash) \ + --fish <($out/bin/minikube completion fish) \ + --zsh <($out/bin/minikube completion zsh) runHook postInstall ''; From 5422674d2cf939f727e53d5a9df63276f819bb74 Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Sat, 11 Jul 2026 22:15:10 +0200 Subject: [PATCH 3/5] minikube: add prefix PATH to wrapped minikube when building with qemu --- pkgs/by-name/mi/minikube/package.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/mi/minikube/package.nix b/pkgs/by-name/mi/minikube/package.nix index 4a96b87c1aeb..09713f7847c0 100644 --- a/pkgs/by-name/mi/minikube/package.nix +++ b/pkgs/by-name/mi/minikube/package.nix @@ -72,7 +72,11 @@ buildGoModule (finalAttrs: { installBin out/minikube wrapProgram $out/bin/minikube --set MINIKUBE_WANTUPDATENOTIFICATION false \ - --prefix PATH : ${lib.makeBinPath (lib.optionals stdenv.hostPlatform.isLinux [ libvirt ])} \ + --prefix PATH : ${ + lib.makeBinPath ( + lib.optionals withQemu [ qemu ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libvirt ] + ) + } \ --prefix LD_LIBRARY_PATH : ${ lib.makeLibraryPath (lib.optionals stdenv.hostPlatform.isLinux [ libvirt ]) } From b64d5151976f905a7465bab9ac6e27c2a35cfcc0 Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Thu, 16 Jul 2026 23:23:11 +0200 Subject: [PATCH 4/5] minikube: Fix darwin build by adding LD_LIBRARY_PATH prefix only on Linux --- pkgs/by-name/mi/minikube/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mi/minikube/package.nix b/pkgs/by-name/mi/minikube/package.nix index 09713f7847c0..46258e41acb4 100644 --- a/pkgs/by-name/mi/minikube/package.nix +++ b/pkgs/by-name/mi/minikube/package.nix @@ -77,9 +77,9 @@ buildGoModule (finalAttrs: { lib.optionals withQemu [ qemu ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libvirt ] ) } \ - --prefix LD_LIBRARY_PATH : ${ - lib.makeLibraryPath (lib.optionals stdenv.hostPlatform.isLinux [ libvirt ]) - } + ${lib.optionalString stdenv.hostPlatform.isLinux "--prefix LD_LIBRARY_PATH : ${ + lib.makeLibraryPath [ libvirt ] + }"} ln -sv $out/bin/minikube $out/bin/kubectl installShellCompletion --cmd minikube \ From 90b88cce0cde2cb755921f2aabd6765dd8cd0cdc Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Thu, 16 Jul 2026 23:24:34 +0200 Subject: [PATCH 5/5] minikube: Add withVfkit parameter --- pkgs/by-name/mi/minikube/package.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/mi/minikube/package.nix b/pkgs/by-name/mi/minikube/package.nix index 46258e41acb4..791e29f09485 100644 --- a/pkgs/by-name/mi/minikube/package.nix +++ b/pkgs/by-name/mi/minikube/package.nix @@ -9,6 +9,8 @@ libvirt, withQemu ? false, qemu, + withVfkit ? false, + vfkit, makeWrapper, writableTmpDirAsHomeHook, OVMF, @@ -74,7 +76,9 @@ buildGoModule (finalAttrs: { wrapProgram $out/bin/minikube --set MINIKUBE_WANTUPDATENOTIFICATION false \ --prefix PATH : ${ lib.makeBinPath ( - lib.optionals withQemu [ qemu ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libvirt ] + lib.optionals withQemu [ qemu ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ libvirt ] + ++ lib.optionals (withVfkit && stdenv.hostPlatform.isDarwin) [ vfkit ] ) } \ ${lib.optionalString stdenv.hostPlatform.isLinux "--prefix LD_LIBRARY_PATH : ${