nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-01 07:01:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "xhyve: update and fix to use our Hypervisor framework"

Browse Source 
This reverts commit f3b65f67d9.
This commit is contained in:
Daiderd Jordan 2016-12-20 13:02:14 +01:00
parent 6b4a41a360
commit 49e3190efa
No known key found for this signature in database
GPG Key ID: D02435D05B810C96
2 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/applications/virtualization/xhyve/default.nix
View File

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

6
pkgs/top-level/all-packages.nix
View File

@ -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 { };