Merge pull request #268619 from tweag/lib-descriptions
[NixPkgs.git] / pkgs / games / frozen-bubble / fix-compilation.patch
blobe87dd0668dc2f8bea9b9c1ce6bca360a9e101e6b
1 diff --git a/Build.PL b/Build.PL
2 index b029d1e..8737395 100644
3 --- a/Build.PL
4 +++ b/Build.PL
5 @@ -16,13 +16,14 @@ use Games::FrozenBubble;
6 my $prefix = Alien::SDL->config('prefix');
7 my $cflags = '-I'
8 . File::Spec->catfile( $prefix, 'include' )
9 + . ' ' . `pkg-config --cflags SDL_mixer`
11 $cflags .= ' -fnested-functions' if $^O =~ /darwin/;
12 ###!!! this looks strange, you perhaps meant "$cflags .= ..."
13 ###!!! I intended Alien::SDL to add -I$prefix/include automatically, please tell me when it does not work (kmx)
14 my $devnull = File::Spec->devnull();
15 my @cflags = ExtUtils::CBuilder->new->split_like_shell( $cflags );
16 -my @linkers = ( ExtUtils::CBuilder->new->split_like_shell( Alien::SDL->config('libs', '-lSDL_mixer', '-lSDL_Pango') ) );
17 +my @linkers = ( ExtUtils::CBuilder->new->split_like_shell( Alien::SDL->config('libs', '-lSDL_Pango',`pkg-config --libs SDL_mixer`) ) );
18 push @linkers, '-liconv'
19 if $^O =~ /win/i; ###!!! really only Win needs this? ; BEWARE this matches also 'darwin', 'cygwin'!!!!
21 diff --git a/inc/My/Builder.pm b/inc/My/Builder.pm
22 index 2ebaf91..c420b9a 100644
23 --- a/inc/My/Builder.pm
24 +++ b/inc/My/Builder.pm
25 @@ -123,7 +123,7 @@ sub ACTION_server {
26 push @ofiles, $cbuilder->compile(
27 source => catfile($server_directory, $cfile),
28 extra_compiler_flags => [
29 - qw(-g -Wall -Werror -pipe), # verbatim from Makefile
30 + qw(-g -pipe), # verbatim from Makefile
31 '-I' . $server_directory, # does not seem to be necessary
32 $cbuilder->split_like_shell(`pkg-config glib-2.0 --cflags`),
33 $cbuilder->split_like_shell(`pkg-config glib-2.0 --libs`),