Skip to content

Commit

Permalink
docker-machine-xhyve: fix file mode inconsistencies
Browse files Browse the repository at this point in the history
File modes are not properly translated from L9P to host values.
Instead, they are assumed to be identical, which is wrong on macOS.
machine-drivers/docker-machine-driver-xhyve#225

(cherry picked from commit 338386b)
  • Loading branch information
mroi authored and dtzWill committed Jan 23, 2020
1 parent 087aea4 commit 8e4b5ac
Showing 1 changed file with 7 additions and 1 deletion.
Original file line number Diff line number Diff line change
@@ -1,11 +1,17 @@
{ stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, cctools, Hypervisor, vmnet }:
{ stdenv, buildGoPackage, fetchFromGitHub, fetchpatch, pkgconfig, cctools, Hypervisor, vmnet }:

buildGoPackage rec {
pname = "docker-machine-xhyve";
version = "0.4.0";

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
Expand Down

0 comments on commit 8e4b5ac

Please sign in to comment.