Skip to content

Commit f2e49f2

Browse files
committed
optee-builder: use stdenv as opposed to gccStdenv
should be the same in our use case, but stdenv is more standard.
1 parent e598a4c commit f2e49f2

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

compulab/ucm-imx95/bsp/ucm-imx95-optee-os.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
}:
55
let
66
inherit (pkgs.buildPackages) python3;
7-
toolchain = pkgs.gccStdenv.cc;
8-
binutils = pkgs.gccStdenv.cc.bintools.bintools_bin;
9-
cpp = pkgs.gccStdenv.cc;
7+
toolchain = pkgs.stdenv.cc;
8+
binutils = pkgs.stdenv.cc.bintools.bintools_bin;
9+
cpp = pkgs.stdenv.cc;
1010
in
1111
pkgs.stdenv.mkDerivation {
1212
pname = "imx95-optee-os";

nxp/common/bsp/imx-optee-builder.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
}:
1414
let
1515
inherit (pkgs.buildPackages) python3;
16-
toolchain = pkgs.gccStdenv.cc;
17-
binutils = pkgs.gccStdenv.cc.bintools.bintools_bin;
18-
cpp = pkgs.gccStdenv.gcc;
16+
toolchain = pkgs.stdenv.cc;
17+
binutils = pkgs.stdenv.cc.bintools.bintools_bin;
18+
cpp = pkgs.stdenv.gcc;
1919

2020
# Determine PLATFORM and PLATFORM_FLAVOR from platformFlavor
2121
# Format can be either "imx-mx93evk" (full platform string) or "mx8mpevk" (just flavor, platform is "imx")

0 commit comments

Comments
 (0)