xhyve: update and fix to use our Hypervisor framework

(this is a cherry-picked version of f3b65f67d9,
which got reverted because it depended on my 10.11 frameworks, which were
flawed)
This commit is contained in:
Dan Peebles 2017-03-14 22:38:35 -04:00
parent 59b795c590
commit dc61ff31a7
2 changed files with 18 additions and 8 deletions

View file

@ -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

View file

@ -18148,7 +18148,11 @@ with pkgs;
xcftools = callPackage ../tools/graphics/xcftools { };
xhyve = callPackage ../applications/virtualization/xhyve { };
xhyve = callPackage ../applications/virtualization/xhyve {
inherit (darwin.apple_sdk.frameworks) Hypervisor vmnet;
inherit (darwin.apple_sdk.libs) xpc;
inherit (darwin) libobjc;
};
xinput_calibrator = callPackage ../tools/X11/xinput_calibrator { };