Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion chainloader.nix
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
(import ./overlay.nix {
inherit withCcache;
smp = false; # No SMP for chainloader
disableTargetWarning = true;
})
],
pkgs ? import nixpkgs {
Expand Down Expand Up @@ -47,5 +48,5 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
pkgs.buildPackages.cmake
pkgs.buildPackages.nasm
];
] ++ [ pkgs.pkgsIncludeOS.suppressTargetWarningHook ];
}
2 changes: 1 addition & 1 deletion default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
smp ? false, # Enable multcore support (SMP)
nixpkgs ? ./pinned.nix,
overlays ? [
(import ./overlay.nix { inherit withCcache; inherit smp; } )
(import ./overlay.nix { inherit withCcache; inherit smp; disableTargetWarning = true; } )
],
pkgs ? import nixpkgs { config = {}; inherit overlays; }
}:
Expand Down
16 changes: 15 additions & 1 deletion overlay.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
withCcache, # Enable ccache. Requires correct permissions, see below.
disableTargetWarning ? true, # TODO: see https://github.com/NixOS/nixpkgs/issues/395191
smp, # Enable multicore support (SMP)
} :
final: prev: {
Expand Down Expand Up @@ -69,9 +70,21 @@ final: prev: {
echo "====="
'';
};

suppressTargetWarningHook = prev.writeTextFile {
name = "suppress-target-warning-hook";
destination = "/nix-support/setup-hook";
text = ''
# see https://github.com/NixOS/nixpkgs/issues/395191
# delete this hook and downstream references once resolved

export NIX_CC_WRAPPER_SUPPRESS_TARGET_WARNING=1
'';
};
in {
# self.callPackage will use this stdenv.
stdenv = final.stdenvIncludeOS.includeos_stdenv;
inherit suppressTargetWarningHook;

# Deps
uzlib = self.callPackage ./deps/uzlib/default.nix { };
Expand Down Expand Up @@ -140,7 +153,8 @@ final: prev: {
nativeBuildInputs = [
prev.buildPackages.cmake
prev.buildPackages.nasm
] ++ prev.lib.optionals withCcache [self.ccacheWrapper ccacheNoticeHook];
] ++ prev.lib.optionals disableTargetWarning [suppressTargetWarningHook]
++ prev.lib.optionals withCcache [self.ccacheWrapper ccacheNoticeHook];

buildInputs = [
self.botan2
Expand Down
2 changes: 1 addition & 1 deletion unikernel.nix
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ includeos.stdenv.mkDerivation rec {
nativeBuildInputs = [
includeos.pkgs.buildPackages.nasm
includeos.pkgs.buildPackages.cmake
];
] ++ [ includeos.pkgs.pkgsIncludeOS.suppressTargetWarningHook ];

buildInputs = [
includeos
Expand Down