diff options
| -rw-r--r-- | pkgs/applications/video/vlc/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/libdvbpsi/default.nix | 19 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 23 insertions, 2 deletions
diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index ce7b233fdd2..471a4c4a76f 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -5,7 +5,7 @@ , libcaca, pulseaudio, flac, schroedinger, libxml2, librsvg , mpeg2dec, udev, gnutls, avahi, libcddb, jackaudio, SDL, SDL_image , libmtp, unzip, taglib, libkate, libtiger, libv4l, samba, liboggz -, libass, libva +, libass, libva, libdvbpsi }: stdenv.mkDerivation rec { @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { pkgconfig dbus hal fribidi qt4 libvorbis libtheora speex lua libgcrypt libupnp libcaca pulseaudio flac schroedinger libxml2 librsvg mpeg2dec udev gnutls avahi libcddb jackaudio SDL SDL_image libmtp unzip taglib - libkate libtiger libv4l samba liboggz libass + libkate libtiger libv4l samba liboggz libass libdvbpsi ] ++ (with xlibs; [ xlibs.xlibs libXv libXvMC libXpm xcbutil libva ]); diff --git a/pkgs/development/libraries/libdvbpsi/default.nix b/pkgs/development/libraries/libdvbpsi/default.nix new file mode 100644 index 00000000000..d3ce7082621 --- /dev/null +++ b/pkgs/development/libraries/libdvbpsi/default.nix @@ -0,0 +1,19 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation { + + name = "libdvbpsi-0.2.2"; + + src = fetchurl { + url = http://download.videolan.org/pub/libdvbpsi/0.2.2/libdvbpsi-0.2.2.tar.bz2; + sha256 = "1lry2swxqm8mhq0a4rjnc819ngsf2pxnfjajb57lml7yr12j79ls"; + }; + + meta = { + description = "A simple library designed for decoding and generation of MPEG TS and DVB PSI tables according to standards ISO/IEC 13818 and ITU-T H.222.0"; + homepage = http://www.videolan.org/developers/libdvbpsi.html ; + platforms = stdenv.lib.platforms.linux; + license = "LGPLv2.1"; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 52057e8a195..d6ea5ba2af8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3859,6 +3859,8 @@ let libdv = callPackage ../development/libraries/libdv { }; + libdvbpsi = callPackage ../development/libraries/libdvbpsi { }; + libdwg = callPackage ../development/libraries/libdwg { }; libdvdcss = callPackage ../development/libraries/libdvdcss { }; |