about summary refs log tree commit diff
path: root/pkgs/applications/networking
diff options
context:
space:
mode:
authorlewo <lewo@abesis.fr>2018-06-24 21:29:03 +0200
committerGitHub <noreply@github.com>2018-06-24 21:29:03 +0200
commit3951a693e5ff6f3359647c79cae7228b9573b87c (patch)
tree258ffcba8dea040ec7c38768ce828bc3207dc466 /pkgs/applications/networking
parentc51ac5eb335c632ec6a762f212bb3f5db0e55d05 (diff)
parentaef546444c75e73d61a0171dd81267b5b1fddf66 (diff)
downloadnixlib-3951a693e5ff6f3359647c79cae7228b9573b87c.tar
nixlib-3951a693e5ff6f3359647c79cae7228b9573b87c.tar.gz
nixlib-3951a693e5ff6f3359647c79cae7228b9573b87c.tar.bz2
nixlib-3951a693e5ff6f3359647c79cae7228b9573b87c.tar.lz
nixlib-3951a693e5ff6f3359647c79cae7228b9573b87c.tar.xz
nixlib-3951a693e5ff6f3359647c79cae7228b9573b87c.tar.zst
nixlib-3951a693e5ff6f3359647c79cae7228b9573b87c.zip
Merge pull request #41644 from tadfisher/minikube
minikube: bundle kvm2 driver
Diffstat (limited to 'pkgs/applications/networking')
-rw-r--r--pkgs/applications/networking/cluster/minikube/default.nix14
1 files changed, 11 insertions, 3 deletions
diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix
index 97bcb1bd1b4d..217998bbf82a 100644
--- a/pkgs/applications/networking/cluster/minikube/default.nix
+++ b/pkgs/applications/networking/cluster/minikube/default.nix
@@ -1,7 +1,15 @@
-{ stdenv, buildGoPackage, fetchFromGitHub, fetchurl, go-bindata, libvirt, qemu, docker-machine-kvm,
-  gpgme, makeWrapper, hostPlatform, vmnet, python }:
+{ stdenv, buildGoPackage, fetchFromGitHub, fetchurl, go-bindata, libvirt, qemu
+, gpgme, makeWrapper, hostPlatform, vmnet, python, pkgconfig
+, docker-machine-kvm, docker-machine-kvm2
+, extraDrivers ? []
+}:
 
-let binPath = stdenv.lib.optionals stdenv.isLinux [ libvirt qemu docker-machine-kvm ];
+let
+  drivers = stdenv.lib.filter (d: d != null) (extraDrivers
+            ++ stdenv.lib.optionals stdenv.isLinux [ docker-machine-kvm docker-machine-kvm2 ]);
+
+  binPath = drivers
+            ++ stdenv.lib.optionals stdenv.isLinux ([ libvirt qemu ]);
 
 in buildGoPackage rec {
   pname   = "minikube";