From 8e4b5ac82500c8130d9dc5734b856f0d6e20f0a2 Mon Sep 17 00:00:00 2001 From: Michael Roitzsch Date: Tue, 10 Dec 2019 12:02:28 +0100 Subject: [PATCH] docker-machine-xhyve: fix file mode inconsistencies File modes are not properly translated from L9P to host values. Instead, they are assumed to be identical, which is wrong on macOS. https://github.com/machine-drivers/docker-machine-driver-xhyve/pull/225 (cherry picked from commit 338386b95d881175ec5e27dda07daccec525f84c) --- .../networking/cluster/docker-machine/xhyve.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/docker-machine/xhyve.nix b/pkgs/applications/networking/cluster/docker-machine/xhyve.nix index e349417c90ede..85b389745503b 100644 --- a/pkgs/applications/networking/cluster/docker-machine/xhyve.nix +++ b/pkgs/applications/networking/cluster/docker-machine/xhyve.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, cctools, Hypervisor, vmnet }: +{ stdenv, buildGoPackage, fetchFromGitHub, fetchpatch, pkgconfig, cctools, Hypervisor, vmnet }: buildGoPackage rec { pname = "docker-machine-xhyve"; @@ -6,6 +6,12 @@ buildGoPackage rec { goPackagePath = "github.com/zchee/docker-machine-driver-xhyve"; + # https://github.com/machine-drivers/docker-machine-driver-xhyve/pull/225 + patches = fetchpatch { + url = "https://github.com/machine-drivers/docker-machine-driver-xhyve/commit/546256494bf2ccc33e4125bf45f504b0e3027d5a.patch"; + sha256 = "1i8wxqccqkxvqrbsyd0g9s0kdskd8xi2jv0c1bji9aj4rq0a8cgz"; + }; + preBuild = '' make -C go/src/${goPackagePath} CC=${stdenv.cc}/bin/cc LIBTOOL=${cctools}/bin/libtool GIT_CMD=: lib9p export CGO_CFLAGS=-I$(pwd)/go/src/${goPackagePath}/vendor/github.com/jceel/lib9p