From 49e3190efa3e307f48d3d3ebfefb421bc5956a6b Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Tue, 20 Dec 2016 13:02:14 +0100 Subject: [PATCH] Revert "xhyve: update and fix to use our Hypervisor framework" This reverts commit f3b65f67d98a2e67c739d4b76b3340eda1dd06f4. --- .../virtualization/xhyve/default.nix | 20 +++++++------------ pkgs/top-level/all-packages.nix | 6 +----- 2 files changed, 8 insertions(+), 18 deletions(-) diff --git a/pkgs/applications/virtualization/xhyve/default.nix b/pkgs/applications/virtualization/xhyve/default.nix index c519784a6233..b7205ac000e2 100644 --- a/pkgs/applications/virtualization/xhyve/default.nix +++ b/pkgs/applications/virtualization/xhyve/default.nix @@ -1,25 +1,19 @@ -{ stdenv, lib, fetchurl, Hypervisor, vmnet, xpc, libobjc }: +{ stdenv, lib, fetchurl }: stdenv.mkDerivation rec { - name = "xhyve-${version}"; - version = "1f1dbe305"; + name = "xhyve-${version}"; + version = "0.2.0"; src = fetchurl { - url = "https://github.com/mist64/xhyve/archive/1f1dbe3059904f885e4ab2b3328f4bb350ea5c37.tar.gz"; - sha256 = "0hfix8yr90szlv2yyqb2rlq5qsrxyam8kg52sly0adja0cpwfjvx"; + url = "https://github.com/mist64/xhyve/archive/v${version}.tar.gz"; + sha256 = "0g1vknnh88kxc8aaqv3j9wqhq45mm9xxxbn1vcrypj3kk9991hrj"; }; - buildInputs = [ Hypervisor vmnet xpc libobjc ]; - # Don't use git to determine version - prePatch = '' - substituteInPlace Makefile \ - --replace 'shell git describe --abbrev=6 --dirty --always --tags' "$version" + buildFlags = '' + CFLAGS=-DVERSION=\"${version}\" ''; - - makeFlags = [ "CFLAGS+=-Wno-shift-sign-overflow" ''CFLAGS+=-DVERSION=\"${version}\"'' ]; - installPhase = '' mkdir -p $out/bin cp build/xhyve $out/bin diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f90c451e6a7a..eb13708d7259 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17657,11 +17657,7 @@ in xcftools = callPackage ../tools/graphics/xcftools { }; - xhyve = callPackage ../applications/virtualization/xhyve { - inherit (darwin.apple_sdk.frameworks) Hypervisor vmnet; - inherit (darwin.apple_sdk.libs) xpc; - inherit (darwin) libobjc; - }; + xhyve = callPackage ../applications/virtualization/xhyve { }; xinput_calibrator = callPackage ../tools/X11/xinput_calibrator { };