alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #318 from iElectric/xbmc-nasm

Browse source 
add nasm to xbmc dependencies
This commit is contained in:
Rok Garbas 2013-02-17 15:46:17 -08:00
parent 77bf593ea2 6506f9b070
commit 614e9b65a0
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/video/xbmc/default.nix
View file

@ -13,7 +13,7 @@
, ffmpeg, libmpeg2, libsamplerate, libmad , ffmpeg, libmpeg2, libsamplerate, libmad
, libogg, libvorbis, flac , libogg, libvorbis, flac
, lzo, libcdio, libmodplug, libass , lzo, libcdio, libmodplug, libass
, sqlite, mysql , sqlite, mysql, nasm
, curl, bzip2, zip, unzip, glxinfo, xdpyinfo , curl, bzip2, zip, unzip, glxinfo, xdpyinfo
, dbus_libs ? null, dbusSupport ? true , dbus_libs ? null, dbusSupport ? true
, udev, udevSupport ? true , udev, udevSupport ? true
@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
ffmpeg libmpeg2 libsamplerate libmad ffmpeg libmpeg2 libsamplerate libmad
libogg libvorbis flac libogg libvorbis flac
lzo libcdio libmodplug libass lzo libcdio libmodplug libass
sqlite mysql sqlite mysql nasm
curl bzip2 zip unzip glxinfo xdpyinfo curl bzip2 zip unzip glxinfo xdpyinfo
] ]
++ lib.optional dbusSupport dbus_libs ++ lib.optional dbusSupport dbus_libs