From 25351ddf709ff7f7be73d8cf4aa32d2ba9ff8d9c Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 8 Jun 2014 12:20:47 +0400 Subject: [PATCH] Use the libav version compatible with our gstreamer version --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 311ee6ec5fa..3e9a517d89b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4635,7 +4635,9 @@ let gperftools = callPackage ../development/libraries/gperftools { }; - gst_all_1 = recurseIntoAttrs(callPackage ../development/libraries/gstreamer { }); + gst_all_1 = recurseIntoAttrs(callPackage ../development/libraries/gstreamer { + callPackage = pkgs.newScope (pkgs // { libav = pkgs.libav_9; }); + }); gst_all = { inherit (pkgs) gstreamer gnonlin gst_python qt_gstreamer;