git.iko.soy/typeable/nixpkgs
on master help sign in
ffmpeg-full: inherit src/version from ffmpeg
commit2c79d7f0c22e79398e67c33054b8d9938b60830e authorzowoq <59103226+zowoq@users.noreply.github.com> dateMon 8 Jun 2020, 14:38 (6 years ago) parenta505e9d
2 files changed+4−7
pkgs/development/libraries/ffmpeg-full/default.nix+2−7 pkgs/top-level/all-packages.nix+2
pkgs/development/libraries/ffmpeg-full/default.nix+2−7
@@ -1,4 +1,4 @@
1−{ stdenv, addOpenGLRunpath, fetchurl, fetchpatch, pkgconfig, perl, texinfo, yasm
1+{ stdenv, ffmpeg, addOpenGLRunpath, fetchurl, fetchpatch, pkgconfig, perl, texinfo, yasm
22/*
33 * Licensing options (yes some are listed twice, filters and such are not listed)
44 */
@@ -239,12 +239,7 @@ assert opensslExtlib -> gnutls == null && openssl != null && nonfreeLicensing;
239239
240240stdenv.mkDerivation rec {
241241 pname = "ffmpeg-full";
242− version = "4.2.3";
243−
244− src = fetchurl {
245− url = "https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.bz2";
246− sha256 = "0pkrariwjv25k7inwshch7b5820ly3hsp991amyb60rkqc8v4zi1";
247− };
242+ inherit (ffmpeg) src version;
248243
249244 patches = [ ./prefer-libdav1d-over-libaom.patch ];
250245
pkgs/top-level/all-packages.nix+2
@@ -11681,6 +11681,8 @@ in
1168111681 ffmpeg = ffmpeg_3;
1168211682
1168311683 ffmpeg-full = callPackage ../development/libraries/ffmpeg-full {
11684+ ffmpeg = ffmpeg_4;
11685+
1168411686 # The following need to be fixed on Darwin
1168511687 frei0r = if stdenv.isDarwin then null else frei0r;
1168611688 game-music-emu = if stdenv.isDarwin then null else game-music-emu;