diff options
| author | Michael Roitzsch <reactorcontrol@icloud.com> | 2019-12-10 12:02:28 +0100 |
|---|---|---|
| committer | Michael Roitzsch <reactorcontrol@icloud.com> | 2019-12-21 19:48:40 +0100 |
| commit | 338386b95d881175ec5e27dda07daccec525f84c (patch) | |
| tree | 7bd91fe86108d64c348e2449323d7f6f237c4b71 /pkgs | |
| parent | 08ecf22b0332de05b6b2290ef4bdac2e2ce10f34 (diff) | |
| download | nixpkgs-338386b95d881175ec5e27dda07daccec525f84c.tar nixpkgs-338386b95d881175ec5e27dda07daccec525f84c.tar.gz nixpkgs-338386b95d881175ec5e27dda07daccec525f84c.tar.bz2 nixpkgs-338386b95d881175ec5e27dda07daccec525f84c.tar.lz nixpkgs-338386b95d881175ec5e27dda07daccec525f84c.tar.xz nixpkgs-338386b95d881175ec5e27dda07daccec525f84c.tar.zst nixpkgs-338386b95d881175ec5e27dda07daccec525f84c.zip | |
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
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/networking/cluster/docker-machine/xhyve.nix | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/applications/networking/cluster/docker-machine/xhyve.nix b/pkgs/applications/networking/cluster/docker-machine/xhyve.nix index f9c7fbf6065..1f1e59a56a4 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 |