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: 1c552615744a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1c7c1e052956
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jan 4, 2020

  1. Verified

    This commit was signed with the committer’s verified signature.
    primeos Michael Weiss
    Copy the full SHA
    1c7c1e0 View commit details
Showing with 7 additions and 10 deletions.
  1. +7 −10 pkgs/tools/video/rav1e/default.nix
17 changes: 7 additions & 10 deletions pkgs/tools/video/rav1e/default.nix
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{ rustPlatform, fetchFromGitHub, fetchurl, stdenv, lib, unzip, nasm }:
{ rustPlatform, fetchFromGitHub, fetchurl, stdenv, lib, nasm }:

rustPlatform.buildRustPackage rec {
pname = "rav1e";
version = "0.2.0";
version = "0.2.1";

src = stdenv.mkDerivation rec {
name = "${pname}-${version}-source";
@@ -11,24 +11,21 @@ rustPlatform.buildRustPackage rec {
owner = "xiph";
repo = "rav1e";
rev = "v${version}";
sha256 = "0sij9hwnar27gcwvfcjbhgyrhw99zjv8gr9s9gshqi766p5dy51a";
sha256 = "1lv8g1vw11lanyx6lqr34hb6m4x1fvwb60kgg5nk8s8hgdr18i0y";
};
cargoLock = fetchurl {
url = "https://github.com/xiph/rav1e/releases/download/v${version}/rav1e-${version}.zip";
sha256 = "1i48c7mvc9q20d76p2rpxva551249m3p52q2z1g9sj4xzpyyk41m";
url = "https://github.com/xiph/rav1e/releases/download/v${version}/Cargo.lock";
sha256 = "1d51wcm537pzfmq48vsv87dwf035yl03qkfc0372gchpv079561w";
};

nativeBuildInputs = [ unzip ];

installPhase = ''
mkdir -p $out
cp -R ./* $out/
unzip ${cargoLock}
cp ./Cargo.lock $out/Cargo.lock
cp ${cargoLock} $out/Cargo.lock
'';
};

cargoSha256 = "1z0xrcq4mx6gpjyqh1csa424sxmx54z3x7ij3w2063h6s2fv9jy3";
cargoSha256 = "0frr4sx05pwvj9gmlvmis6lrnbwk3x579fv3kw38374jy33nrr6z";

nativeBuildInputs = [ nasm ];