summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorMichael Raskin <7c6f434c@mail.ru>2014-06-08 12:20:47 +0400
committerMichael Raskin <7c6f434c@mail.ru>2014-06-08 12:20:47 +0400
commit25351ddf709ff7f7be73d8cf4aa32d2ba9ff8d9c (patch)
tree39be999e04cbe997072af837a98a06dd3d5b6397 /pkgs/top-level
parentd91eacd7200214de1349a1738fabe18bd0289c8d (diff)
downloadnixlib-25351ddf709ff7f7be73d8cf4aa32d2ba9ff8d9c.tar
nixlib-25351ddf709ff7f7be73d8cf4aa32d2ba9ff8d9c.tar.gz
nixlib-25351ddf709ff7f7be73d8cf4aa32d2ba9ff8d9c.tar.bz2
nixlib-25351ddf709ff7f7be73d8cf4aa32d2ba9ff8d9c.tar.lz
nixlib-25351ddf709ff7f7be73d8cf4aa32d2ba9ff8d9c.tar.xz
nixlib-25351ddf709ff7f7be73d8cf4aa32d2ba9ff8d9c.tar.zst
nixlib-25351ddf709ff7f7be73d8cf4aa32d2ba9ff8d9c.zip
Use the libav version compatible with our gstreamer version
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix4
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 311ee6ec5fa7..3e9a517d89b8 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;