From 665bb0a776609291f7b5ea1d7ce439dcdfed3418 Mon Sep 17 00:00:00 2001 From: Yureka Date: Thu, 15 Jan 2026 12:34:25 +0100 Subject: [PATCH] m1n1: always build with chainloading support In the past, Rust was only required for the chainloading feature, but starting from the next m1n1 release Rust will be mandatory. Include Rust dependencies and the chainloading feature unconditionally, matching the upstream m1n1 release builds. --- pkgs/by-name/m1/m1n1/package.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/m1/m1n1/package.nix b/pkgs/by-name/m1/m1n1/package.nix index 052c7e6942664..a0d89aec4ea69 100644 --- a/pkgs/by-name/m1/m1n1/package.nix +++ b/pkgs/by-name/m1/m1n1/package.nix @@ -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;