Unverified Commit 6fd688ea authored by Florian Klink's avatar Florian Klink Committed by GitHub
Browse files

m1n1: always build with chainloading support (#480344)

parents 0b23892e 665bb0a7

pkgs/by-name/m1/m1n1/package.nix

+2 −5
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ 
  nixos-icons,

  buildPackages,

  customLogo ? "${nixos-icons}/share/icons/hicolor/256x256/apps/nix-snowflake.png",

  withChainloading ? false,

}:



let
@@ -52,8 +51,6 @@ stdenv.mkDerivation (finalAttrs: { 


  nativeBuildInputs = [

    imagemagick

  ]

  ++ lib.optionals withChainloading [

    rustPackages.rustc

    rustPackages.cargo

    rustPlatform.cargoSetupHook
@@ -70,9 +67,9 @@ stdenv.mkDerivation (finalAttrs: { 
  makeFlags = [

    "ARCH=${stdenv.cc.targetPrefix}"

    "RELEASE=1"

    "CHAINLOADING=1"

  ]

  ++ lib.optional (customLogo != null) "LOGO=custom"

  ++ lib.optional withChainloading "CHAINLOADING=1";

  ++ lib.optional (customLogo != null) "LOGO=custom";



  enableParallelBuilding = true;