From 207da49692914ba347bfdfa2348779743368edd9 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Wed, 3 Mar 2021 15:09:18 +0100 Subject: [PATCH] vbox5: do not build from depot The depot build is somehow broken by ERIS patching. --- packages/genodelabs/depot-targets.nix | 7 ------- packages/genodelabs/make-targets.nix | 6 ++++++ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/packages/genodelabs/depot-targets.nix b/packages/genodelabs/depot-targets.nix index c70e460..8cdacbc 100644 --- a/packages/genodelabs/depot-targets.nix +++ b/packages/genodelabs/depot-targets.nix @@ -13,11 +13,6 @@ let hostLibcInc = includeDir buildPackages.glibc; # TODO: does this need to be glibc? - vbox5' = { - nativeBuildInputs = with buildPackages; [ iasl yasm ]; - depotInputs = with self; [ posix libiconv stdcxx zlib ]; - portInputs = with ports; [ qemu-usb virtualbox5 ]; - }; in { acpi_drv = { }; acpica = { }; @@ -301,8 +296,6 @@ in { usb_drv.portInputs = with ports; [ dde_linux ]; usb_hid_drv = { }; usb_host_drv = { }; - vbox5 = vbox5'; - vbox5-nova = vbox5'; verify = { }; vesa_drv.portInputs = with ports; [ libc x86emu ]; vfs = { }; diff --git a/packages/genodelabs/make-targets.nix b/packages/genodelabs/make-targets.nix index 05ac18c..25ffe82 100644 --- a/packages/genodelabs/make-targets.nix +++ b/packages/genodelabs/make-targets.nix @@ -16,4 +16,10 @@ patches = [ ./patches/test-vmm_x86.patch ]; }; + vbox5 = { + targets = [ "virtualbox5" ]; + nativeBuildInputs = with buildPackages; [ iasl yasm ]; + portInputs = with ports; [ libc libiconv qemu-usb stdcxx virtualbox5 ]; + }; + }