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: 0e239cc5c43c
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ba5d3e975428
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on May 20, 2020

  1. dav1d: 0.6.0 -> 0.7.0

    @primeos
    primeos committed May 20, 2020

    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
    b1b3073 View commit details

Commits on May 21, 2020

  1. Merge pull request #88453 from primeos/dav1d

    @dywedir
    dywedir authored May 21, 2020
    Copy the full SHA
    ba5d3e9 View commit details
Showing with 3 additions and 10 deletions.
  1. +3 −10 pkgs/development/libraries/dav1d/default.nix
13 changes: 3 additions & 10 deletions pkgs/development/libraries/dav1d/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitLab, fetchpatch
{ stdenv, fetchFromGitLab
, meson, ninja, nasm, pkgconfig
, withTools ? false # "dav1d" binary
, withExamples ? false, SDL2 # "dav1dplay" binary
@@ -9,23 +9,16 @@ assert useVulkan -> withExamples;

stdenv.mkDerivation rec {
pname = "dav1d";
version = "0.6.0";
version = "0.7.0";

src = fetchFromGitLab {
domain = "code.videolan.org";
owner = "videolan";
repo = pname;
rev = version;
sha256 = "1gr859xzbqrsp892v9zzzgrg8smnnzgc1jmb68qzl54a4g6jrxm0";
sha256 = "0zmn4ald518vgs3cc0ga227aimr38h16mkliq5j8mg6p9dn7nx1w";
};

patches = [
(fetchpatch {
url = "https://code.videolan.org/videolan/dav1d/-/commit/e04227c5f6729b460e0b8e5fb52eae2d5acd15ef.patch";
sha256 = "18mpvwviqx0x9k6av98vgpjqlzcjd89g8496zsbf57bw5dadij3l";
})
];

nativeBuildInputs = [ meson ninja nasm pkgconfig ];
# TODO: doxygen (currently only HTML and not build by default).
buildInputs = stdenv.lib.optional withExamples SDL2