diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-11-19 17:14:52 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-11-19 17:14:52 +0100 |
| commit | f4d4283e3992c3f559831b1c030cd1fda6d45f98 (patch) | |
| tree | c2cc63060849298d9a8e7a329010bb0fc4abb219 /nixpkgs/pkgs/development/libraries/libaom | |
| parent | dac53cd746c10feddd48d4a1981235a653d7d32a (diff) | |
| parent | 0ace63bed8f561e4cc5b1c8fa5fee6be61fbcf8b (diff) | |
| download | nixlib-f4d4283e3992c3f559831b1c030cd1fda6d45f98.tar nixlib-f4d4283e3992c3f559831b1c030cd1fda6d45f98.tar.gz nixlib-f4d4283e3992c3f559831b1c030cd1fda6d45f98.tar.bz2 nixlib-f4d4283e3992c3f559831b1c030cd1fda6d45f98.tar.lz nixlib-f4d4283e3992c3f559831b1c030cd1fda6d45f98.tar.xz nixlib-f4d4283e3992c3f559831b1c030cd1fda6d45f98.tar.zst nixlib-f4d4283e3992c3f559831b1c030cd1fda6d45f98.zip | |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs into HEAD
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libaom')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/libaom/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libaom/default.nix b/nixpkgs/pkgs/development/libraries/libaom/default.nix index c5e40babfd67..30d3c0d81b55 100644 --- a/nixpkgs/pkgs/development/libraries/libaom/default.nix +++ b/nixpkgs/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 |