From 6a13805863e2e54e70117463c7ee34c90709155f Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Mon, 25 May 2020 20:19:18 +0530 Subject: [PATCH] cleanup deduplicate vbox target --- packages/genodelabs/targets.nix | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/packages/genodelabs/targets.nix b/packages/genodelabs/targets.nix index 52732b0..1163585 100644 --- a/packages/genodelabs/targets.nix +++ b/packages/genodelabs/targets.nix @@ -1,5 +1,12 @@ { buildPackages, ports }: -with ports; { +with ports; +let + vbox5' = { + nativeBuildInputs = with buildPackages; [ iasl yasm ]; + patches = [ ./vbox-framebuffer-fail-on-fail.patch ./vbox-debug.patch ]; + portInputs = [ libc libiconv qemu-usb stdcxx virtualbox5 ]; + }; +in { gpt_write.portInputs = [ jitterentropy ]; @@ -47,17 +54,9 @@ with ports; { usb_drv.portInputs = [ dde_linux ]; - vbox5 = { - nativeBuildInputs = with buildPackages; [ iasl yasm ]; - patches = [ ./vbox-framebuffer-fail-on-fail.patch ./vbox-debug.patch ]; - portInputs = [ libc libiconv qemu-usb stdcxx virtualbox5 ]; - }; + vbox5 = vbox5'; - vbox5-nova = { - nativeBuildInputs = with buildPackages; [ iasl yasm ]; - patches = [ ./vbox5-iasl.patch ./vbox-framebuffer-fail-on-fail.patch ]; - portInputs = [ libc libiconv qemu-usb stdcxx virtualbox5 ]; - }; + vbox5-nova = vbox5'; vesa_drv.portInputs = [ libc x86emu ];