From f2e49f279c3f7e95a64cae6397b14ed9254874e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 4 Nov 2025 12:34:11 +0100 Subject: [PATCH] optee-builder: use stdenv as opposed to gccStdenv should be the same in our use case, but stdenv is more standard. --- compulab/ucm-imx95/bsp/ucm-imx95-optee-os.nix | 6 +++--- nxp/common/bsp/imx-optee-builder.nix | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/compulab/ucm-imx95/bsp/ucm-imx95-optee-os.nix b/compulab/ucm-imx95/bsp/ucm-imx95-optee-os.nix index 81b56edb..6b66cf6c 100644 --- a/compulab/ucm-imx95/bsp/ucm-imx95-optee-os.nix +++ b/compulab/ucm-imx95/bsp/ucm-imx95-optee-os.nix @@ -4,9 +4,9 @@ }: let inherit (pkgs.buildPackages) python3; - toolchain = pkgs.gccStdenv.cc; - binutils = pkgs.gccStdenv.cc.bintools.bintools_bin; - cpp = pkgs.gccStdenv.cc; + toolchain = pkgs.stdenv.cc; + binutils = pkgs.stdenv.cc.bintools.bintools_bin; + cpp = pkgs.stdenv.cc; in pkgs.stdenv.mkDerivation { pname = "imx95-optee-os"; diff --git a/nxp/common/bsp/imx-optee-builder.nix b/nxp/common/bsp/imx-optee-builder.nix index 6b6c229c..ffd1e787 100644 --- a/nxp/common/bsp/imx-optee-builder.nix +++ b/nxp/common/bsp/imx-optee-builder.nix @@ -13,9 +13,9 @@ }: let inherit (pkgs.buildPackages) python3; - toolchain = pkgs.gccStdenv.cc; - binutils = pkgs.gccStdenv.cc.bintools.bintools_bin; - cpp = pkgs.gccStdenv.gcc; + toolchain = pkgs.stdenv.cc; + binutils = pkgs.stdenv.cc.bintools.bintools_bin; + cpp = pkgs.stdenv.gcc; # Determine PLATFORM and PLATFORM_FLAVOR from platformFlavor # Format can be either "imx-mx93evk" (full platform string) or "mx8mpevk" (just flavor, platform is "imx")