mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 06:31:02 +00:00
Code Issues Wiki Activity

Merge pull request #8891 from mk0x9/mpd-on-darwin

Browse source 
mpd on darwin
This commit is contained in:
zimbatm 2016-06-13 00:10:16 +01:00 committed by GitHub
parent f16171dd24 3be214d324
commit 5d6c4314ce
2 changed files with 148 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

142
pkgs/servers/mpd/darwin-enable-cxx-exceptions.patch Normal file
View file

@ -0,0 +1,142 @@
diff -Naur mpd-0.19.9.orig/configure mpd-0.19.9/configure
--- mpd-0.19.9.orig/configure 2015-01-26 19:47:27.000000000 +0000
+++ mpd-0.19.9/configure 2015-01-26 19:47:27.000000000 +0000
@@ -17113,138 +17113,6 @@
done
-if test x$no_exceptions = xyes; then
-
-
-
-
-for flag in -fno-exceptions; do
- as_CACHEVAR=`$as_echo "ax_cv_check_cxxflags__$flag" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C++ compiler accepts $flag" >&5
-$as_echo_n "checking whether C++ compiler accepts $flag... " >&6; }
-if eval \${$as_CACHEVAR+:} false; then :
- $as_echo_n "(cached) " >&6
-else
-
- ax_check_save_flags=$CXXFLAGS
- CXXFLAGS="$CXXFLAGS $flag"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
- eval "$as_CACHEVAR=yes"
-else
- eval "$as_CACHEVAR=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- CXXFLAGS=$ax_check_save_flags
-fi
-eval ac_res=\$$as_CACHEVAR
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if test x"`eval 'as_val=${'$as_CACHEVAR'};$as_echo "$as_val"'`" = xyes; then :
- if ${CXXFLAGS+:} false; then :
- case " $CXXFLAGS " in
- *" $flag "*)
- { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS already contains \$flag"; } >&5
- (: CXXFLAGS already contains $flag) 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }
- ;;
- *)
- { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS \$flag\""; } >&5
- (: CXXFLAGS="$CXXFLAGS $flag") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }
- CXXFLAGS="$CXXFLAGS $flag"
- ;;
- esac
-else
- CXXFLAGS="$flag"
-fi
-
-else
- :
-fi
-
-done
-
-
-
-
-
-for flag in -fno-rtti; do
- as_CACHEVAR=`$as_echo "ax_cv_check_cxxflags__$flag" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C++ compiler accepts $flag" >&5
-$as_echo_n "checking whether C++ compiler accepts $flag... " >&6; }
-if eval \${$as_CACHEVAR+:} false; then :
- $as_echo_n "(cached) " >&6
-else
-
- ax_check_save_flags=$CXXFLAGS
- CXXFLAGS="$CXXFLAGS $flag"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
- eval "$as_CACHEVAR=yes"
-else
- eval "$as_CACHEVAR=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- CXXFLAGS=$ax_check_save_flags
-fi
-eval ac_res=\$$as_CACHEVAR
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if test x"`eval 'as_val=${'$as_CACHEVAR'};$as_echo "$as_val"'`" = xyes; then :
- if ${CXXFLAGS+:} false; then :
- case " $CXXFLAGS " in
- *" $flag "*)
- { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS already contains \$flag"; } >&5
- (: CXXFLAGS already contains $flag) 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }
- ;;
- *)
- { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS \$flag\""; } >&5
- (: CXXFLAGS="$CXXFLAGS $flag") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }
- CXXFLAGS="$CXXFLAGS $flag"
- ;;
- esac
-else
- CXXFLAGS="$flag"
-fi
-
-else
- :
-fi
-
-done
-
-fi

10
pkgs/servers/mpd/default.nix
View file

@ -39,6 +39,8 @@ in stdenv.mkDerivation rec {
sha256 = "12wvqb5r3q77x78wigmrsz3vv8rykcfnavffcvlqq0sbi4is5f8c";
};
patches = stdenv.lib.optionals stdenv.isDarwin ./darwin-enable-cxx-exceptions.patch;
buildInputs = [ pkgconfig glib boost ]
++ opt stdenv.isLinux systemd
++ opt (stdenv.isLinux && alsaSupport) alsaLib
@ -61,8 +63,8 @@ in stdenv.mkDerivation rec {
++ opt mpg123Support mpg123
++ opt aacSupport faad2
++ opt zipSupport zziplib
++ opt pulseaudioSupport libpulseaudio
++ opt jackSupport libjack2
++ opt (!stdenv.isDarwin && pulseaudioSupport) libpulseaudio
++ opt (!stdenv.isDarwin && jackSupport) libjack2
++ opt gmeSupport game-music-emu
++ opt icuSupport icu
++ opt clientSupport mpd_clientlib
@ -89,8 +91,8 @@ in stdenv.mkDerivation rec {
(mkFlag mmsSupport "mms")
(mkFlag mpg123Support "mpg123")
(mkFlag aacSupport "aac")
(mkFlag pulseaudioSupport "pulse")
(mkFlag jackSupport "jack")
(mkFlag (!stdenv.isDarwin && pulseaudioSupport) "pulse")
(mkFlag (!stdenv.isDarwin && jackSupport) "jack")
(mkFlag stdenv.isDarwin "osx")
(mkFlag icuSupport "icu")
(mkFlag gmeSupport "gme")