From 93197aabea48d19ae3504bd8d082648fb48056e4 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 9 Jan 2017 19:15:58 +0000 Subject: [PATCH] mpd: fix on darwin by removing a patch that is no longer needed after the update to 0.20 --- .../mpd/darwin-enable-cxx-exceptions.patch | 142 ------------------ pkgs/servers/mpd/default.nix | 2 - 2 files changed, 144 deletions(-) delete mode 100644 pkgs/servers/mpd/darwin-enable-cxx-exceptions.patch diff --git a/pkgs/servers/mpd/darwin-enable-cxx-exceptions.patch b/pkgs/servers/mpd/darwin-enable-cxx-exceptions.patch deleted file mode 100644 index db330a913cbd..000000000000 --- a/pkgs/servers/mpd/darwin-enable-cxx-exceptions.patch +++ /dev/null @@ -1,142 +0,0 @@ -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 - - - diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 5b2195b3d7eb..c07ca6a83420 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -39,8 +39,6 @@ in stdenv.mkDerivation rec { sha256 = "068nxsfkp2ppcjh3fmcbapkiwnjpvkii73bfydpw4bf2yphdvsa8"; }; - patches = stdenv.lib.optionals stdenv.isDarwin ./darwin-enable-cxx-exceptions.patch; - buildInputs = [ pkgconfig glib boost ] ++ opt stdenv.isDarwin darwin.apple_sdk.frameworks.CoreAudioKit ++ opt stdenv.isLinux systemd