diff options
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libaom')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/libaom/default.nix | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libaom/default.nix b/nixpkgs/pkgs/development/libraries/libaom/default.nix index 575c2613e5b1..6be0370a1773 100644 --- a/nixpkgs/pkgs/development/libraries/libaom/default.nix +++ b/nixpkgs/pkgs/development/libraries/libaom/default.nix @@ -3,13 +3,16 @@ , enableVmaf ? true, libvmaf }: +let + isCross = stdenv.buildPlatform != stdenv.hostPlatform; +in stdenv.mkDerivation rec { pname = "libaom"; - version = "3.4.0"; + version = "3.6.1"; src = fetchzip { url = "https://aomedia.googlesource.com/aom/+archive/v${version}.tar.gz"; - sha256 = "sha256-NgzpVxQmsgOPzKkGpJIJrLiNQcruhpEoCi/CYJx5b3A="; + sha256 = "sha256-U7hmKdpjTtqStM4UIjCvgJ2swpZ1x0Px1Q9+gSHbaeQ="; stripRoot = false; }; @@ -45,7 +48,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ # CPU detection isn't supported on Darwin and breaks the aarch64-darwin build: "-DCONFIG_RUNTIME_CPU_DETECT=0" - ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + ] ++ lib.optionals (isCross && !stdenv.hostPlatform.isx86) [ "-DAS_EXECUTABLE=${stdenv.cc.targetPrefix}as" ] ++ lib.optionals stdenv.isAarch32 [ # armv7l-hf-multiplatform does not support NEON @@ -55,6 +58,8 @@ stdenv.mkDerivation rec { postFixup = '' moveToOutput lib/libaom.a "$static" + '' + lib.optionalString stdenv.hostPlatform.isStatic '' + ln -s $static $out ''; outputs = [ "out" "bin" "dev" "static" ]; @@ -70,6 +75,7 @@ stdenv.mkDerivation rec { changelog = "https://aomedia.googlesource.com/aom/+/refs/tags/v${version}/CHANGELOG"; maintainers = with maintainers; [ primeos kiloreux dandellion ]; platforms = platforms.all; + outputsToInstall = [ "bin" ]; license = licenses.bsd2; }; } |