Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: bf369bf35307
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e72aa92b3844
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jul 3, 2018

  1. libaom: 0.1.0 -> 1.0.0

    @dywedir
    dywedir committed Jul 3, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ff50c61 View commit details

Commits on Jul 7, 2018

  1. Merge pull request #42954 from dywedir/libaom 

    libaom: 0.1.0 -> 1.0.0
    @infinisil
    infinisil authored Jul 7, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    e72aa92 View commit details
Showing with 8 additions and 11 deletions.
  1. +8 −11 pkgs/development/libraries/libaom/default.nix
19 changes: 8 additions & 11 deletions pkgs/development/libraries/libaom/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,25 +1,22 @@
{ stdenv, fetchgit, yasm, perl, cmake, pkgconfig }:
{ stdenv, fetchgit, yasm, perl, cmake, pkgconfig, python3Packages }:

stdenv.mkDerivation rec {
name = "libaom-0.1.0";
name = "libaom-${version}";
version = "1.0.0";

src = fetchgit {
url = "https://aomedia.googlesource.com/aom";
rev = "105e9b195bb90c9b06edcbcb13b6232dab6db0b7";
sha256 = "1fl2sca4df01gyn00s0xcwwirxccfnjppvjdrxdnb8f2naj721by";
rev = "v${version}";
sha256 = "07h2vhdiq7c3fqaz44rl4vja3dgryi6n7kwbwbj1rh485ski4j82";
};

buildInputs = [ perl yasm ];
nativeBuildInputs = [ cmake pkgconfig ];

cmakeFlags = [
"-DCONFIG_UNIT_TESTS=0"
];
buildInputs = [ perl yasm ];
nativeBuildInputs = [ cmake pkgconfig python3Packages.python ];

meta = with stdenv.lib; {
description = "AV1 Bitstream and Decoding Library";
homepage = https://aomedia.org/av1-features/get-started/;
maintainers = with maintainers; [ kiloreux ];
platforms = platforms.all;
};
}
}