aboutsummaryrefslogtreecommitdiff
path: root/pkgs/tools/video
diff options
context:
space:
mode:
authorMichael Weiss <dev.primeos@gmail.com>2020-06-08 20:01:32 +0200
committerMichael Weiss <dev.primeos@gmail.com>2020-06-13 15:22:42 +0200
commite3fa38ec16314ab4fedd0d6305d81079c55d5cba (patch)
tree71503875e853e07125a9132f30b7b8fa3edbb710 /pkgs/tools/video
parentdde87455eddee287d605a24ccacbfc8e67f2c19c (diff)
rav1e: 0.3.2 -> 0.3.3
The Cargo.lock file is not included in the master branch but it is currently added for the releases (e.g. [0]). Since the GitHub deploy action currently fails for other reasons [1] we should use the Cargo.lock from the repository instead. [0]: https://github.com/xiph/rav1e/commit/80573d2bf733494b69c27cc3fd87f4b31e71d1d1 [1]: https://github.com/xiph/rav1e/issues/2373
Diffstat (limited to 'pkgs/tools/video')
-rw-r--r--pkgs/tools/video/rav1e/default.nix30
1 files changed, 8 insertions, 22 deletions
diff --git a/pkgs/tools/video/rav1e/default.nix b/pkgs/tools/video/rav1e/default.nix
index 02f6d12278a4..245f74bb5455 100644
--- a/pkgs/tools/video/rav1e/default.nix
+++ b/pkgs/tools/video/rav1e/default.nix
@@ -1,31 +1,17 @@
-{ rustPlatform, fetchFromGitHub, fetchurl, stdenv, lib, nasm }:
+{ rustPlatform, fetchFromGitHub, lib, nasm }:
rustPlatform.buildRustPackage rec {
pname = "rav1e";
- version = "0.3.2";
+ version = "0.3.3";
- src = stdenv.mkDerivation rec {
- name = "${pname}-${version}-source";
-
- src = fetchFromGitHub {
- owner = "xiph";
- repo = "rav1e";
- rev = "v${version}";
- sha256 = "0qqw397yfglwj9kg45imhx1p5bb0nsx2gkaxj4lcc9i1hav6ia43";
- };
- cargoLock = fetchurl {
- url = "https://github.com/xiph/rav1e/releases/download/v${version}/Cargo.lock";
- sha256 = "1kdr3q97vq3mip1h7iv2iy9qzlgb69y6nwjzbw9nfi7dl7ip6q3l";
- };
-
- installPhase = ''
- mkdir -p $out
- cp -R ./* $out/
- cp ${cargoLock} $out/Cargo.lock
- '';
+ src = fetchFromGitHub {
+ owner = "xiph";
+ repo = "rav1e";
+ rev = "v${version}";
+ sha256 = "0a9dryag4x35a2c45qiq1j5xk9ydcpw1g6kici85d2yrc2z3hwrx";
};
- cargoSha256 = "03zsvavk7wskz843qxwwcymhclarcp6nfxwa1mwna3nmzvlm1hwb";
+ cargoSha256 = "1xaincrmpicp0skf9788w5631x1hxvifvq06hh5ribdz79zclzx3";
nativeBuildInputs = [ nasm ];