public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #11730 from spwhitt/mopidy

Browse Source 
Mopidy Improvements
This commit is contained in:
Rickard Nilsson
2015-12-17 20:42:13 +01:00
parent 73ead2826a 3bc477e2f2
commit c634e5cd24
11 changed files with 135 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix
View File

@@ -1,7 +1,7 @@
{ fetchurl, stdenv, pkgconfig, gst_plugins_base, aalib, cairo
, flac, libjpeg, zlib, speex, libpng, libdv, libcaca, libvpx
, libiec61883, libavc1394, taglib, libpulseaudio, gdk_pixbuf, orc
, glib, gstreamer, bzip2, libsoup, libintlOrEmpty
, glib, gstreamer, bzip2, libsoup, libshout, libintlOrEmpty
, # Whether to build no plugins that have external dependencies
# (except the PulseAudio plugin).
minimalDeps ? false
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
++ libintlOrEmpty
++ stdenv.lib.optionals (!minimalDeps)
[ aalib libcaca cairo libdv flac libjpeg libpng speex
taglib bzip2 libvpx gdk_pixbuf orc libsoup ];
taglib bzip2 libvpx gdk_pixbuf orc libsoup libshout ];
NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null;

4
pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix
View File

@@ -1,5 +1,5 @@
{ fetchurl, stdenv, pkgconfig, glib, gstreamer, gst_plugins_base
, libmad, libdvdread, libmpeg2, libcdio, a52dec, x264, orc, libintlOrEmpty }:
, libmad, libdvdread, libmpeg2, libcdio, a52dec, x264, orc, lame, libintlOrEmpty }:
stdenv.mkDerivation rec {
name = "gst-plugins-ugly-0.10.19";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
};
buildInputs =
[ pkgconfig glib gstreamer gst_plugins_base libmad libdvdread a52dec x264 orc ] ++ libintlOrEmpty;
[ pkgconfig glib gstreamer gst_plugins_base libmad libdvdread a52dec x264 orc lame ] ++ libintlOrEmpty;
NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null;