diff options
| author | Artturi <Artturin@artturin.com> | 2023-11-19 02:22:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-19 02:22:10 +0200 |
| commit | cc27610d342cda732a0e77befa8ae895116a22bd (patch) | |
| tree | 0ec0fcf9204cc2704e0285afe446df8fbf8bb406 /pkgs/development/libraries | |
| parent | 6fe6b9b4bb202a5e5f834f60e375a597dd9e8c6c (diff) | |
| parent | 10bc6bce5ad0e0ab3c13163d6e25ffaad2a3b840 (diff) | |
| download | nixpkgs-cc27610d342cda732a0e77befa8ae895116a22bd.tar nixpkgs-cc27610d342cda732a0e77befa8ae895116a22bd.tar.gz nixpkgs-cc27610d342cda732a0e77befa8ae895116a22bd.tar.bz2 nixpkgs-cc27610d342cda732a0e77befa8ae895116a22bd.tar.lz nixpkgs-cc27610d342cda732a0e77befa8ae895116a22bd.tar.xz nixpkgs-cc27610d342cda732a0e77befa8ae895116a22bd.tar.zst nixpkgs-cc27610d342cda732a0e77befa8ae895116a22bd.zip | |
Merge pull request #266257 from amjoseph-nixpkgs/pr/libaom/fixcross
Diffstat (limited to 'pkgs/development/libraries')
| -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 c5e40babfd6..30d3c0d81b5 100644 --- a/pkgs/development/libraries/libaom/default.nix +++ b/pkgs/development/libraries/libaom/default.nix @@ -50,7 +50,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 |