format nix code after nixfmt update

This commit is contained in:
Jörg Thalheim
2025-08-17 11:21:04 +02:00
parent 4bafcc2454
commit 6ec1e82182
13 changed files with 105 additions and 109 deletions

View File

@@ -47,21 +47,20 @@ pkgs.stdenv.mkDerivation rec {
${firmwareSeco} --auto-accept --force
'';
filesToInstall =
[
"firmware-imx-${fwHdmiVersion}/firmware/hdmi/cadence/dpfw.bin"
"firmware-imx-${fwHdmiVersion}/firmware/hdmi/cadence/hdmi?xfw.bin"
]
++ pkgs.lib.optional (targetBoard == "imx8qm") (
"imx-sc-firmware-${fwScVersion}/mx8qm-mek-scfw-tcm.bin"
+ " "
+ "imx-seco-${fwSecoVersion}/firmware/seco/mx8qmb0-ahab-container.img"
)
++ pkgs.lib.optional (targetBoard == "imx8qxp") (
"imx-sc-firmware-${fwScVersion}/mx8qx-mek-scfw-tcm.bin"
+ " "
+ "imx-seco-${fwSecoVersion}/firmware/seco/mx8qxc0-ahab-container.img"
);
filesToInstall = [
"firmware-imx-${fwHdmiVersion}/firmware/hdmi/cadence/dpfw.bin"
"firmware-imx-${fwHdmiVersion}/firmware/hdmi/cadence/hdmi?xfw.bin"
]
++ pkgs.lib.optional (targetBoard == "imx8qm") (
"imx-sc-firmware-${fwScVersion}/mx8qm-mek-scfw-tcm.bin"
+ " "
+ "imx-seco-${fwSecoVersion}/firmware/seco/mx8qmb0-ahab-container.img"
)
++ pkgs.lib.optional (targetBoard == "imx8qxp") (
"imx-sc-firmware-${fwScVersion}/mx8qx-mek-scfw-tcm.bin"
+ " "
+ "imx-seco-${fwSecoVersion}/firmware/seco/mx8qxc0-ahab-container.img"
);
installPhase = ''
mkdir -p $out

View File

@@ -61,20 +61,19 @@ pkgs.stdenv.mkDerivation {
--replace "\$(CROSS_COMPILE_\$(sm))cpp" ${cpp}/bin/cpp
'';
makeFlags =
[
"PLATFORM=${platform}"
]
++ lib.optionals (!hasFullPlatform) [
"PLATFORM_FLAVOR=${flavor}"
]
++ [
"CFG_ARM64_core=y"
"CFG_TEE_TA_LOG_LEVEL=0"
"CFG_TEE_CORE_LOG_LEVEL=0"
"CROSS_COMPILE=${toolchain}/bin/${toolchain.targetPrefix}"
"CROSS_COMPILE64=${toolchain}/bin/${toolchain.targetPrefix}"
];
makeFlags = [
"PLATFORM=${platform}"
]
++ lib.optionals (!hasFullPlatform) [
"PLATFORM_FLAVOR=${flavor}"
]
++ [
"CFG_ARM64_core=y"
"CFG_TEE_TA_LOG_LEVEL=0"
"CFG_TEE_CORE_LOG_LEVEL=0"
"CROSS_COMPILE=${toolchain}/bin/${toolchain.targetPrefix}"
"CROSS_COMPILE64=${toolchain}/bin/${toolchain.targetPrefix}"
];
installPhase = ''
mkdir -p $out
@@ -85,5 +84,6 @@ pkgs.stdenv.mkDerivation {
homepage = "https://github.com/nxp-imx/imx-optee-os";
license = [ lib.licenses.bsd2 ];
platforms = [ "aarch64-linux" ];
} // meta;
}
// meta;
}

View File

@@ -57,7 +57,8 @@ stdenv.mkDerivation {
gnutls
perl
efitools
] ++ extraNativeBuildInputs;
]
++ extraNativeBuildInputs;
depsBuildBuild = [ buildPackages.stdenv.cc ];
hardeningDisable = [ "all" ];