diff options
| author | Dan Peebles <pumpkin@me.com> | 2017-03-14 22:38:35 -0400 |
|---|---|---|
| committer | Dan Peebles <pumpkin@me.com> | 2017-03-14 22:38:35 -0400 |
| commit | dc61ff31a75b76e02a6565e35fa21a11a3a9e5fe (patch) | |
| tree | 534578b3ad782370bd4349302a263edc6ae073a1 /pkgs/applications/virtualization | |
| parent | 59b795c5901c0a60aa5dd973474e41520224a380 (diff) | |
| download | nixpkgs-dc61ff31a75b76e02a6565e35fa21a11a3a9e5fe.tar nixpkgs-dc61ff31a75b76e02a6565e35fa21a11a3a9e5fe.tar.gz nixpkgs-dc61ff31a75b76e02a6565e35fa21a11a3a9e5fe.tar.bz2 nixpkgs-dc61ff31a75b76e02a6565e35fa21a11a3a9e5fe.tar.lz nixpkgs-dc61ff31a75b76e02a6565e35fa21a11a3a9e5fe.tar.xz nixpkgs-dc61ff31a75b76e02a6565e35fa21a11a3a9e5fe.tar.zst nixpkgs-dc61ff31a75b76e02a6565e35fa21a11a3a9e5fe.zip | |
xhyve: update and fix to use our Hypervisor framework
(this is a cherry-picked version of f3b65f67d98a2e67c739d4b76b3340eda1dd06f4, which got reverted because it depended on my 10.11 frameworks, which were flawed)
Diffstat (limited to 'pkgs/applications/virtualization')
| -rw-r--r-- | pkgs/applications/virtualization/xhyve/default.nix | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/pkgs/applications/virtualization/xhyve/default.nix b/pkgs/applications/virtualization/xhyve/default.nix index b7205ac000e..c519784a623 100644 --- a/pkgs/applications/virtualization/xhyve/default.nix +++ b/pkgs/applications/virtualization/xhyve/default.nix @@ -1,19 +1,25 @@ -{ stdenv, lib, fetchurl }: +{ stdenv, lib, fetchurl, Hypervisor, vmnet, xpc, libobjc }: stdenv.mkDerivation rec { - name = "xhyve-${version}"; - version = "0.2.0"; + name = "xhyve-${version}"; + version = "1f1dbe305"; src = fetchurl { - url = "https://github.com/mist64/xhyve/archive/v${version}.tar.gz"; - sha256 = "0g1vknnh88kxc8aaqv3j9wqhq45mm9xxxbn1vcrypj3kk9991hrj"; + url = "https://github.com/mist64/xhyve/archive/1f1dbe3059904f885e4ab2b3328f4bb350ea5c37.tar.gz"; + sha256 = "0hfix8yr90szlv2yyqb2rlq5qsrxyam8kg52sly0adja0cpwfjvx"; }; + buildInputs = [ Hypervisor vmnet xpc libobjc ]; + # Don't use git to determine version - buildFlags = '' - CFLAGS=-DVERSION=\"${version}\" + prePatch = '' + substituteInPlace Makefile \ + --replace 'shell git describe --abbrev=6 --dirty --always --tags' "$version" ''; + + makeFlags = [ "CFLAGS+=-Wno-shift-sign-overflow" ''CFLAGS+=-DVERSION=\"${version}\"'' ]; + installPhase = '' mkdir -p $out/bin cp build/xhyve $out/bin |