diff options
| author | Domen Kožar <domen@dev.si> | 2014-01-11 12:37:47 -0800 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2014-01-11 12:37:47 -0800 |
| commit | ae02a0c4113ab37ccd146c06d786d16141a469a5 (patch) | |
| tree | 6cdddd0e863353f0e23b16a2a30fa3dc5bc97f7c /pkgs/top-level | |
| parent | dca9e47e00f8fa4e1df4c45e55814b5e6978070d (diff) | |
| parent | 640e13ce1333fb33be02931299f99ab98ab56b93 (diff) | |
| download | nixlib-ae02a0c4113ab37ccd146c06d786d16141a469a5.tar nixlib-ae02a0c4113ab37ccd146c06d786d16141a469a5.tar.gz nixlib-ae02a0c4113ab37ccd146c06d786d16141a469a5.tar.bz2 nixlib-ae02a0c4113ab37ccd146c06d786d16141a469a5.tar.lz nixlib-ae02a0c4113ab37ccd146c06d786d16141a469a5.tar.xz nixlib-ae02a0c4113ab37ccd146c06d786d16141a469a5.tar.zst nixlib-ae02a0c4113ab37ccd146c06d786d16141a469a5.zip | |
Merge pull request #1403 from iyzsong/gstreamer
add gstreamer 1.2.1
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 510ffe307f64..ac8ef80eec8c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4413,6 +4413,8 @@ let mpfr = callPackage ../development/libraries/mpfr { }; mpfr_3_1_2 = callPackage ../development/libraries/mpfr/3.1.2.nix { }; + gst_all_1 = callPackage ../development/libraries/gstreamer { }; + gst_all = { inherit (pkgs) gstreamer gnonlin gst_python qt_gstreamer; gstPluginsBase = pkgs.gst_plugins_base; @@ -4422,29 +4424,29 @@ let gstFfmpeg = pkgs.gst_ffmpeg; }; - gstreamer = callPackage ../development/libraries/gstreamer/gstreamer {}; + gstreamer = callPackage ../development/libraries/gstreamer/legacy/gstreamer {}; - gst_plugins_base = callPackage ../development/libraries/gstreamer/gst-plugins-base {}; + gst_plugins_base = callPackage ../development/libraries/gstreamer/legacy/gst-plugins-base {}; - gst_plugins_good = callPackage ../development/libraries/gstreamer/gst-plugins-good {}; + gst_plugins_good = callPackage ../development/libraries/gstreamer/legacy/gst-plugins-good {}; - gst_plugins_bad = callPackage ../development/libraries/gstreamer/gst-plugins-bad {}; + gst_plugins_bad = callPackage ../development/libraries/gstreamer/legacy/gst-plugins-bad {}; - gst_plugins_ugly = callPackage ../development/libraries/gstreamer/gst-plugins-ugly {}; + gst_plugins_ugly = callPackage ../development/libraries/gstreamer/legacy/gst-plugins-ugly {}; - gst_ffmpeg = callPackage ../development/libraries/gstreamer/gst-ffmpeg { + gst_ffmpeg = callPackage ../development/libraries/gstreamer/legacy/gst-ffmpeg { ffmpeg = ffmpeg_0_10; }; - gst_python = callPackage ../development/libraries/gstreamer/gst-python {}; + gst_python = callPackage ../development/libraries/gstreamer/legacy/gst-python {}; - gnonlin = callPackage ../development/libraries/gstreamer/gnonlin {}; + gnonlin = callPackage ../development/libraries/gstreamer/legacy/gnonlin {}; gusb = callPackage ../development/libraries/gusb { inherit (gnome) gtkdoc; }; - qt_gstreamer = callPackage ../development/libraries/gstreamer/qt-gstreamer {}; + qt_gstreamer = callPackage ../development/libraries/gstreamer/legacy/qt-gstreamer {}; gnet = callPackage ../development/libraries/gnet { }; |