mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 13:41:26 +00:00
Merge pull request #318 from iElectric/xbmc-nasm
add nasm to xbmc dependencies
This commit is contained in:
commit
614e9b65a0
|
@ -13,7 +13,7 @@
|
|||
, ffmpeg, libmpeg2, libsamplerate, libmad
|
||||
, libogg, libvorbis, flac
|
||||
, lzo, libcdio, libmodplug, libass
|
||||
, sqlite, mysql
|
||||
, sqlite, mysql, nasm
|
||||
, curl, bzip2, zip, unzip, glxinfo, xdpyinfo
|
||||
, dbus_libs ? null, dbusSupport ? true
|
||||
, udev, udevSupport ? true
|
||||
|
@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
|
|||
ffmpeg libmpeg2 libsamplerate libmad
|
||||
libogg libvorbis flac
|
||||
lzo libcdio libmodplug libass
|
||||
sqlite mysql
|
||||
sqlite mysql nasm
|
||||
curl bzip2 zip unzip glxinfo xdpyinfo
|
||||
]
|
||||
++ lib.optional dbusSupport dbus_libs
|
||||
|
|
Loading…
Reference in a new issue