pyrox.dev
lol
Merge pull request #8891 from mk0x9/mpd-on-darwin
mpd on darwin
authored by
GitHub
5d6c4314
f16171dd
+148
-4
+142
pkgs/servers/mpd/darwin-enable-cxx-exceptions.patch
+142
pkgs/servers/mpd/darwin-enable-cxx-exceptions.patch
···
1
+
diff -Naur mpd-0.19.9.orig/configure mpd-0.19.9/configure
2
+
--- mpd-0.19.9.orig/configure 2015-01-26 19:47:27.000000000 +0000
3
+
+++ mpd-0.19.9/configure 2015-01-26 19:47:27.000000000 +0000
4
+
@@ -17113,138 +17113,6 @@
5
+
done
6
+
7
+
8
+
-if test x$no_exceptions = xyes; then
9
+
-
10
+
-
11
+
-
12
+
-
13
+
-for flag in -fno-exceptions; do
14
+
- as_CACHEVAR=`$as_echo "ax_cv_check_cxxflags__$flag" | $as_tr_sh`
15
+
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C++ compiler accepts $flag" >&5
16
+
-$as_echo_n "checking whether C++ compiler accepts $flag... " >&6; }
17
+
-if eval \${$as_CACHEVAR+:} false; then :
18
+
- $as_echo_n "(cached) " >&6
19
+
-else
20
+
-
21
+
- ax_check_save_flags=$CXXFLAGS
22
+
- CXXFLAGS="$CXXFLAGS $flag"
23
+
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
24
+
-/* end confdefs.h. */
25
+
-
26
+
-int
27
+
-main ()
28
+
-{
29
+
-
30
+
- ;
31
+
- return 0;
32
+
-}
33
+
-_ACEOF
34
+
-if ac_fn_cxx_try_compile "$LINENO"; then :
35
+
- eval "$as_CACHEVAR=yes"
36
+
-else
37
+
- eval "$as_CACHEVAR=no"
38
+
-fi
39
+
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
40
+
- CXXFLAGS=$ax_check_save_flags
41
+
-fi
42
+
-eval ac_res=\$$as_CACHEVAR
43
+
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
44
+
-$as_echo "$ac_res" >&6; }
45
+
-if test x"`eval 'as_val=${'$as_CACHEVAR'};$as_echo "$as_val"'`" = xyes; then :
46
+
- if ${CXXFLAGS+:} false; then :
47
+
- case " $CXXFLAGS " in
48
+
- *" $flag "*)
49
+
- { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS already contains \$flag"; } >&5
50
+
- (: CXXFLAGS already contains $flag) 2>&5
51
+
- ac_status=$?
52
+
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
53
+
- test $ac_status = 0; }
54
+
- ;;
55
+
- *)
56
+
- { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS \$flag\""; } >&5
57
+
- (: CXXFLAGS="$CXXFLAGS $flag") 2>&5
58
+
- ac_status=$?
59
+
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
60
+
- test $ac_status = 0; }
61
+
- CXXFLAGS="$CXXFLAGS $flag"
62
+
- ;;
63
+
- esac
64
+
-else
65
+
- CXXFLAGS="$flag"
66
+
-fi
67
+
-
68
+
-else
69
+
- :
70
+
-fi
71
+
-
72
+
-done
73
+
-
74
+
-
75
+
-
76
+
-
77
+
-
78
+
-for flag in -fno-rtti; do
79
+
- as_CACHEVAR=`$as_echo "ax_cv_check_cxxflags__$flag" | $as_tr_sh`
80
+
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C++ compiler accepts $flag" >&5
81
+
-$as_echo_n "checking whether C++ compiler accepts $flag... " >&6; }
82
+
-if eval \${$as_CACHEVAR+:} false; then :
83
+
- $as_echo_n "(cached) " >&6
84
+
-else
85
+
-
86
+
- ax_check_save_flags=$CXXFLAGS
87
+
- CXXFLAGS="$CXXFLAGS $flag"
88
+
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
89
+
-/* end confdefs.h. */
90
+
-
91
+
-int
92
+
-main ()
93
+
-{
94
+
-
95
+
- ;
96
+
- return 0;
97
+
-}
98
+
-_ACEOF
99
+
-if ac_fn_cxx_try_compile "$LINENO"; then :
100
+
- eval "$as_CACHEVAR=yes"
101
+
-else
102
+
- eval "$as_CACHEVAR=no"
103
+
-fi
104
+
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
105
+
- CXXFLAGS=$ax_check_save_flags
106
+
-fi
107
+
-eval ac_res=\$$as_CACHEVAR
108
+
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
109
+
-$as_echo "$ac_res" >&6; }
110
+
-if test x"`eval 'as_val=${'$as_CACHEVAR'};$as_echo "$as_val"'`" = xyes; then :
111
+
- if ${CXXFLAGS+:} false; then :
112
+
- case " $CXXFLAGS " in
113
+
- *" $flag "*)
114
+
- { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS already contains \$flag"; } >&5
115
+
- (: CXXFLAGS already contains $flag) 2>&5
116
+
- ac_status=$?
117
+
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
118
+
- test $ac_status = 0; }
119
+
- ;;
120
+
- *)
121
+
- { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS \$flag\""; } >&5
122
+
- (: CXXFLAGS="$CXXFLAGS $flag") 2>&5
123
+
- ac_status=$?
124
+
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
125
+
- test $ac_status = 0; }
126
+
- CXXFLAGS="$CXXFLAGS $flag"
127
+
- ;;
128
+
- esac
129
+
-else
130
+
- CXXFLAGS="$flag"
131
+
-fi
132
+
-
133
+
-else
134
+
- :
135
+
-fi
136
+
-
137
+
-done
138
+
-
139
+
-fi
140
+
141
+
142
+
+6
-4
pkgs/servers/mpd/default.nix
+6
-4
pkgs/servers/mpd/default.nix
···
39
39
sha256 = "12wvqb5r3q77x78wigmrsz3vv8rykcfnavffcvlqq0sbi4is5f8c";
40
40
};
41
41
42
+
patches = stdenv.lib.optionals stdenv.isDarwin ./darwin-enable-cxx-exceptions.patch;
43
+
42
44
buildInputs = [ pkgconfig glib boost ]
43
45
++ opt stdenv.isLinux systemd
44
46
++ opt (stdenv.isLinux && alsaSupport) alsaLib
···
61
63
++ opt mpg123Support mpg123
62
64
++ opt aacSupport faad2
63
65
++ opt zipSupport zziplib
64
-
++ opt pulseaudioSupport libpulseaudio
65
-
++ opt jackSupport libjack2
66
+
++ opt (!stdenv.isDarwin && pulseaudioSupport) libpulseaudio
67
+
++ opt (!stdenv.isDarwin && jackSupport) libjack2
66
68
++ opt gmeSupport game-music-emu
67
69
++ opt icuSupport icu
68
70
++ opt clientSupport mpd_clientlib
···
89
91
(mkFlag mmsSupport "mms")
90
92
(mkFlag mpg123Support "mpg123")
91
93
(mkFlag aacSupport "aac")
92
-
(mkFlag pulseaudioSupport "pulse")
93
-
(mkFlag jackSupport "jack")
94
+
(mkFlag (!stdenv.isDarwin && pulseaudioSupport) "pulse")
95
+
(mkFlag (!stdenv.isDarwin && jackSupport) "jack")
94
96
(mkFlag stdenv.isDarwin "osx")
95
97
(mkFlag icuSupport "icu")
96
98
(mkFlag gmeSupport "gme")