diff options
author | Doron Behar <doron.behar@gmail.com> | 2020-06-07 15:39:09 +0300 |
---|---|---|
committer | Jon <jonringer@users.noreply.github.com> | 2020-06-12 11:55:31 -0700 |
commit | 01d4e2fe332420684803170597d1b88e9f826303 (patch) | |
tree | 0a998e2bf5326595ec4a1fcffad7bfd963760dad /pkgs/development/libraries/pangolin | |
parent | 8e1dcea3d575dfd4ecdee336e5b95c093f3017cb (diff) |
treewide: use ffmpeg_3 explicitly if not wanted otherwise
After making `ffmpeg` point to the latest `ffmpeg_4`, all packages that used `ffmpeg` without requiring a specific version now use ffmpeg_3 explicitly so they shouldn't change.
Diffstat (limited to 'pkgs/development/libraries/pangolin')
-rw-r--r-- | pkgs/development/libraries/pangolin/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/pangolin/default.nix b/pkgs/development/libraries/pangolin/default.nix index e9f55dd6145f6..3af1833fe49f5 100644 --- a/pkgs/development/libraries/pangolin/default.nix +++ b/pkgs/development/libraries/pangolin/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, cmake, pkgconfig, doxygen, libGL, glew -, xorg , ffmpeg, python3 , libjpeg, libpng, libtiff, eigen +, xorg , ffmpeg_3, python3 , libjpeg, libpng, libtiff, eigen , Carbon ? null, Cocoa ? null }: @@ -21,7 +21,7 @@ stdenv.mkDerivation { libGL glew xorg.libX11 - ffmpeg + ffmpeg_3 python3 libjpeg libpng |