Merge pull request #2710 from lovek323/mpd

mpd: fix build on darwin
This commit is contained in:
Domen Kožar 2014-05-25 15:34:10 +02:00
commit a088c6fa36
7 changed files with 46 additions and 13 deletions

View file

@ -11,6 +11,6 @@ stdenv.mkDerivation rec {
meta = {
homepage = http://www.nasm.us/;
description = "An 80x86 and x86-64 assembler designed for portability and modularity";
platforms = stdenv.lib.platforms.linux;
platforms = stdenv.lib.platforms.unix;
};
}

View file

@ -12,6 +12,6 @@ stdenv.mkDerivation rec {
homepage = http://www.tortall.net/projects/yasm/;
description = "Complete rewrite of the NASM assembler";
license = "BSD";
platforms = stdenv.lib.platforms.linux;
platforms = stdenv.lib.platforms.unix;
};
}

View file

@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
"--enable-avresample"
"--enable-runtime-cpudetect"
]
++ stdenv.lib.optional subtitleSupport "--enable-libass"
++ stdenv.lib.optional (!stdenv.isDarwin && subtitleSupport) "--enable-libass"
++ stdenv.lib.optional mp3Support "--enable-libmp3lame"
++ stdenv.lib.optional speexSupport "--enable-libspeex"
++ stdenv.lib.optional theoraSupport "--enable-libtheora"
@ -55,13 +55,12 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional faacSupport "--enable-libfaac --enable-nonfree"
++ stdenv.lib.optional dc1394Support "--enable-libdc1394"
++ stdenv.lib.optional x11grabSupport "--enable-x11grab"
++ stdenv.lib.optional playSupport "--enable-ffplay"
++ stdenv.lib.optional (!stdenv.isDarwin && playSupport) "--enable-ffplay"
++ stdenv.lib.optional freetypeSupport "--enable-libfreetype --enable-fontconfig"
++ stdenv.lib.optional fdkAACSupport "--enable-libfdk_aac --enable-nonfree"
++ stdenv.lib.optional gnutlsSupport "--enable-gnutls";
buildInputs = [ pkgconfig lame yasm zlib bzip2 alsaLib texinfo perl ]
++ stdenv.lib.optional subtitleSupport libass
buildInputs = [ pkgconfig lame yasm zlib bzip2 texinfo perl ]
++ stdenv.lib.optional mp3Support lame
++ stdenv.lib.optional speexSupport speex
++ stdenv.lib.optional theoraSupport libtheora
@ -75,10 +74,12 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional faacSupport faac
++ stdenv.lib.optional dc1394Support libdc1394
++ stdenv.lib.optionals x11grabSupport [ libXext libXfixes ]
++ stdenv.lib.optional playSupport SDL
++ stdenv.lib.optional (!stdenv.isDarwin && playSupport) SDL
++ stdenv.lib.optionals freetypeSupport [ freetype fontconfig ]
++ stdenv.lib.optional fdkAACSupport fdk_aac
++ stdenv.lib.optional gnutlsSupport gnutls;
++ stdenv.lib.optional gnutlsSupport gnutls
++ stdenv.lib.optional (!stdenv.isDarwin && subtitleSupport) libass
++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib;
enableParallelBuilding = true;

View file

@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
description = "Client library for MPD (music player daemon)";
homepage = http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki;
license = "GPLv2";
platforms = with stdenv.lib.platforms; linux;
platforms = with stdenv.lib.platforms; unix;
maintainers = [ stdenv.lib.maintainers.mornfall ];
};
}

View file

@ -80,6 +80,7 @@ in stdenv.mkDerivation rec {
(mkFlag mmsSupport "mms")
(mkFlag mpg123Support "mpg123")
(mkFlag aacSupport "aac")
(mkFlag stdenv.isDarwin "osx")
"--enable-debugging" ]
++ opt stdenv.isLinux
"--with-systemdsystemunitdir=$(out)/etc/systemd/system";

View file

@ -0,0 +1,31 @@
{ stdenv, fetchgit, autoconf, automake, libtool, pkgconfig, glib, libdaemon
, mpd_clientlib, curl, sqlite, ruby, rubyLibs, libnotify }:
stdenv.mkDerivation rec {
version = "20130809";
name = "mpdcron-${version}";
src = fetchgit {
url = https://github.com/alip/mpdcron.git;
rev = "1dd16181c32f33e7754bbe21841c8e70b28f8ecd";
sha256 = "1h3n433jn9yg74i218pkxzrngsjpnf0z02lakfldl6j1s9di2pn3";
};
meta = {
description = "A cron like daemon for mpd.";
homepage = http://alip.github.io/mpdcron/;
license = stdenv.lib.licenses.gpl2;
platforms = with stdenv.lib.platforms; unix;
maintainers = [ stdenv.lib.maintainers.lovek323 ];
};
buildInputs =
[ autoconf automake libtool pkgconfig glib libdaemon
mpd_clientlib curl sqlite ruby rubyLibs.nokogiri libnotify ];
preConfigure = ''
./autogen.sh
'';
configureFlags = [ "--enable-gmodule" "--with-standard-modules=all" ];
}

View file

@ -638,6 +638,8 @@ let
mcrl2 = callPackage ../tools/misc/mcrl2 { };
mpdcron = callPackage ../tools/audio/mpdcron { };
syslogng = callPackage ../tools/system/syslog-ng { };
rsyslog = callPackage ../tools/system/rsyslog { };
@ -6613,10 +6615,8 @@ let
mod_wsgi = callPackage ../servers/http/apache-modules/mod_wsgi { };
mpd = callPackage ../servers/mpd {
# resolve the "stray '@' in program" errors
stdenv = if stdenv.isDarwin
then overrideGCC stdenv gccApple
else stdenv;
aacSupport = config.mpd.aacSupport or true;
ffmpegSupport = config.mpd.ffmpegSupport or true;
};
mpd_clientlib = callPackage ../servers/mpd/clientlib.nix { };