From 44184862ccf7ff8afb216033726d40dd2147fbb4 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Sat, 20 Jun 2020 11:48:44 +0530 Subject: [PATCH] Target overrides for linux hybrid depot packages --- packages/default.nix | 1 + packages/genodelabs/targets.nix | 15 +++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/packages/default.nix b/packages/default.nix index ecb1ab5..3cc81fe 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -75,6 +75,7 @@ in depotPkgs // { base-linux = buildUpstream { name = "base-linux"; KERNEL = "linux"; + BOARD = "linux"; targets = [ "core" "timer" "lib/ld" ]; patches = basePatches; postInstall = '' diff --git a/packages/genodelabs/targets.nix b/packages/genodelabs/targets.nix index dd751ad..433b6a0 100644 --- a/packages/genodelabs/targets.nix +++ b/packages/genodelabs/targets.nix @@ -1,6 +1,11 @@ { buildPackages, ports }: with ports; let + includeDir = pkg: buildPackages.lib.getDev pkg + "/include"; + + hostLibcInc = includeDir buildPackages.glibc; + # TODO: does this need to be glibc? + vbox5' = { nativeBuildInputs = with buildPackages; [ iasl yasm ]; patches = [ ./vbox-framebuffer-fail-on-fail.patch ]; @@ -10,6 +15,12 @@ in { cached_fs_rom.patches = [ ./cached_fs_rom.patch ]; + fb_sdl = with buildPackages; { + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ SDL ]; + HOST_INC_DIR = [ hostLibcInc (includeDir SDL) ]; + }; + gpt_write.portInputs = [ jitterentropy ]; init.patches = [ ./sandbox.patch ]; @@ -30,6 +41,10 @@ in { libiconv.portInputs = [ libc libiconv ]; + linux_nic_drv.HOST_INC_DIR = [ hostLibcInc ]; + + lx_block.HOST_INC_DIR = [ hostLibcInc ]; + noux.portInputs = [ libc ]; posix.portInputs = [ libc ];