From 10bc6bce5ad0e0ab3c13163d6e25ffaad2a3b840 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Wed, 8 Nov 2023 04:08:40 -0800 Subject: libaom: fix cross Apparently the CMake variable for indicating the assembler has changed from `AS_EXECUTABLE` to `CMAKE_ASM_COMPILER`. --- pkgs/development/libraries/libaom/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/development') diff --git a/pkgs/development/libraries/libaom/default.nix b/pkgs/development/libraries/libaom/default.nix index 6be0370a177..de3ce39d3a6 100644 --- a/pkgs/development/libraries/libaom/default.nix +++ b/pkgs/development/libraries/libaom/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { # CPU detection isn't supported on Darwin and breaks the aarch64-darwin build: "-DCONFIG_RUNTIME_CPU_DETECT=0" ] ++ lib.optionals (isCross && !stdenv.hostPlatform.isx86) [ - "-DAS_EXECUTABLE=${stdenv.cc.targetPrefix}as" + "-DCMAKE_ASM_COMPILER=${stdenv.cc.targetPrefix}as" ] ++ lib.optionals stdenv.isAarch32 [ # armv7l-hf-multiplatform does not support NEON # see lib/systems/platform.nix -- cgit 1.4.1