Skip to content

Commit 8e4b5ac

Browse files
mroidtzWill
authored andcommitted
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. machine-drivers/docker-machine-driver-xhyve#225 (cherry picked from commit 338386b)
1 parent 087aea4 commit 8e4b5ac

1 file changed

Lines changed: 7 additions & 1 deletion

File tree

  • pkgs/applications/networking/cluster/docker-machine

pkgs/applications/networking/cluster/docker-machine/xhyve.nix

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,17 @@
1-
{ stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, cctools, Hypervisor, vmnet }:
1+
{ stdenv, buildGoPackage, fetchFromGitHub, fetchpatch, pkgconfig, cctools, Hypervisor, vmnet }:
22

33
buildGoPackage rec {
44
pname = "docker-machine-xhyve";
55
version = "0.4.0";
66

77
goPackagePath = "github.com/zchee/docker-machine-driver-xhyve";
88

9+
# https://github.com/machine-drivers/docker-machine-driver-xhyve/pull/225
10+
patches = fetchpatch {
11+
url = "https://github.com/machine-drivers/docker-machine-driver-xhyve/commit/546256494bf2ccc33e4125bf45f504b0e3027d5a.patch";
12+
sha256 = "1i8wxqccqkxvqrbsyd0g9s0kdskd8xi2jv0c1bji9aj4rq0a8cgz";
13+
};
14+
915
preBuild = ''
1016
make -C go/src/${goPackagePath} CC=${stdenv.cc}/bin/cc LIBTOOL=${cctools}/bin/libtool GIT_CMD=: lib9p
1117
export CGO_CFLAGS=-I$(pwd)/go/src/${goPackagePath}/vendor/github.com/jceel/lib9p

0 commit comments

Comments
 (0)