diff options
| author | Michael Roitzsch <reactorcontrol@icloud.com> | 2019-12-10 12:00:39 +0100 |
|---|---|---|
| committer | Michael Roitzsch <reactorcontrol@icloud.com> | 2019-12-21 19:48:40 +0100 |
| commit | 08ecf22b0332de05b6b2290ef4bdac2e2ce10f34 (patch) | |
| tree | ce8ab43743a5adabfac03b6a0256b12f7602f044 /pkgs | |
| parent | 475bf6d2a5f3ba2e4c3d2b31b6e54f26e1aa7163 (diff) | |
| download | nixpkgs-08ecf22b0332de05b6b2290ef4bdac2e2ce10f34.tar nixpkgs-08ecf22b0332de05b6b2290ef4bdac2e2ce10f34.tar.gz nixpkgs-08ecf22b0332de05b6b2290ef4bdac2e2ce10f34.tar.bz2 nixpkgs-08ecf22b0332de05b6b2290ef4bdac2e2ce10f34.tar.lz nixpkgs-08ecf22b0332de05b6b2290ef4bdac2e2ce10f34.tar.xz nixpkgs-08ecf22b0332de05b6b2290ef4bdac2e2ce10f34.tar.zst nixpkgs-08ecf22b0332de05b6b2290ef4bdac2e2ce10f34.zip | |
docker-machine-xhyve: support lib9p shared file system
The lib9p library for host-guest file sharing in xhyve needs to be built separately.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/networking/cluster/docker-machine/xhyve.nix | 9 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
2 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/applications/networking/cluster/docker-machine/xhyve.nix b/pkgs/applications/networking/cluster/docker-machine/xhyve.nix index d448d4ae8e7..f9c7fbf6065 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, Hypervisor, vmnet }: +{ stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, cctools, Hypervisor, vmnet }: buildGoPackage rec { pname = "docker-machine-xhyve"; @@ -6,6 +6,13 @@ buildGoPackage rec { goPackagePath = "github.com/zchee/docker-machine-driver-xhyve"; + 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 + export CGO_LDFLAGS=$(pwd)/go/src/${goPackagePath}/vendor/build/lib9p/lib9p.a + ''; + buildFlags = "--tags lib9p"; + src = fetchFromGitHub { rev = "v${version}"; owner = "machine-drivers"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fe1ebed12f2..0276ae63934 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18373,6 +18373,7 @@ in docker-machine-kvm2 = callPackage ../applications/networking/cluster/docker-machine/kvm2.nix { }; docker-machine-xhyve = callPackage ../applications/networking/cluster/docker-machine/xhyve.nix { inherit (darwin.apple_sdk.frameworks) Hypervisor vmnet; + inherit (darwin) cctools; }; docker-distribution = callPackage ../applications/virtualization/docker/distribution.nix { }; |