diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-02-11 18:16:48 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-11 18:16:48 +0000 |
| commit | 402b75252162f81b3fe7d4b3539bbeecd2c451d6 (patch) | |
| tree | 01a75a6f7fb7625ffe1e9b44e8fadcacef60fe4b /pkgs/development/libraries/libaom | |
| parent | 1af73c223c9774307ead017003c8e5844fb78cf1 (diff) | |
| parent | bde46aca9ea536b0c97081b532f75be47d38cb71 (diff) | |
| download | nixpkgs-402b75252162f81b3fe7d4b3539bbeecd2c451d6.tar nixpkgs-402b75252162f81b3fe7d4b3539bbeecd2c451d6.tar.gz nixpkgs-402b75252162f81b3fe7d4b3539bbeecd2c451d6.tar.bz2 nixpkgs-402b75252162f81b3fe7d4b3539bbeecd2c451d6.tar.lz nixpkgs-402b75252162f81b3fe7d4b3539bbeecd2c451d6.tar.xz nixpkgs-402b75252162f81b3fe7d4b3539bbeecd2c451d6.tar.zst nixpkgs-402b75252162f81b3fe7d4b3539bbeecd2c451d6.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/libraries/libaom')
| -rw-r--r-- | pkgs/development/libraries/libaom/default.nix | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/development/libraries/libaom/default.nix b/pkgs/development/libraries/libaom/default.nix index c26161eeab6..ec41a3e8f31 100644 --- a/pkgs/development/libraries/libaom/default.nix +++ b/pkgs/development/libraries/libaom/default.nix @@ -32,6 +32,9 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DENABLE_TESTS=OFF" + ] ++ lib.optionals stdenv.isDarwin [ + # CPU detection isn't supported on Darwin and breaks the aarch64-darwin build: + "-DCONFIG_RUNTIME_CPU_DETECT=OFF" ]; postFixup = '' |