From 9232a335ef19af4926739335c0617c0f64d751f7 Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Thu, 22 Aug 2019 18:26:51 +0900 Subject: [PATCH] docker-machine-kvm2: update for changes to minikube In "minikube: 1.0.1 -> 1.2.0" [1], the package changed from buildGoPackage to buildGoModule. This package, docker-machine-kvm2, is built from the same sources and must follow the same packaging. [1] a12efe947f90ec816d5a9b5a03922a8eefd476bd --- .../networking/cluster/docker-machine/kvm2.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/docker-machine/kvm2.nix b/pkgs/applications/networking/cluster/docker-machine/kvm2.nix index d8fa1a04507..b8b9fa035d1 100644 --- a/pkgs/applications/networking/cluster/docker-machine/kvm2.nix +++ b/pkgs/applications/networking/cluster/docker-machine/kvm2.nix @@ -1,6 +1,6 @@ -{ stdenv, buildGoPackage, libvirt, pkgconfig, minikube }: +{ stdenv, buildGoModule, libvirt, pkgconfig, minikube }: -buildGoPackage rec { +buildGoModule rec { pname = "docker-machine-kvm2"; name = "${pname}-${version}"; version = minikube.version; @@ -10,6 +10,8 @@ buildGoPackage rec { src = minikube.src; + modSha256 = minikube.go-modules.outputHash; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libvirt ]; @@ -18,7 +20,7 @@ buildGoPackage rec { ''; postInstall = '' - mv $bin/bin/kvm $bin/bin/docker-machine-driver-kvm2 + mv $out/bin/kvm $out/bin/docker-machine-driver-kvm2 ''; meta = with stdenv.lib; {