diff options
| author | Adam Joseph <adam@westernsemico.com> | 2023-11-08 04:08:40 -0800 |
|---|---|---|
| committer | Adam Joseph <adam@westernsemico.com> | 2023-11-08 04:09:41 -0800 |
| commit | 10bc6bce5ad0e0ab3c13163d6e25ffaad2a3b840 (patch) | |
| tree | a178d976623d4e24423da64f42a97665a4ba57f2 /pkgs/development | |
| parent | 408ed815c60c448886d489837e760264efcc4388 (diff) | |
| download | nixpkgs-10bc6bce5ad0e0ab3c13163d6e25ffaad2a3b840.tar nixpkgs-10bc6bce5ad0e0ab3c13163d6e25ffaad2a3b840.tar.gz nixpkgs-10bc6bce5ad0e0ab3c13163d6e25ffaad2a3b840.tar.bz2 nixpkgs-10bc6bce5ad0e0ab3c13163d6e25ffaad2a3b840.tar.lz nixpkgs-10bc6bce5ad0e0ab3c13163d6e25ffaad2a3b840.tar.xz nixpkgs-10bc6bce5ad0e0ab3c13163d6e25ffaad2a3b840.tar.zst nixpkgs-10bc6bce5ad0e0ab3c13163d6e25ffaad2a3b840.zip | |
libaom: fix cross
Apparently the CMake variable for indicating the assembler has changed from `AS_EXECUTABLE` to `CMAKE_ASM_COMPILER`.
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/libraries/libaom/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
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 |