public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SDL: build statically against x11 on Darwin

Browse Source
This commit is contained in:
Jan Malakhovski 2018-03-06 15:35:27 +00:00
parent 39319f3a75
commit 19130ebc5d
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/libraries/SDL/default.nix
View File

@ -21,7 +21,14 @@ let
"--disable-oss" "--disable-oss"
"--disable-video-x11-xme" "--disable-video-x11-xme"
"--enable-rpath" "--enable-rpath"
] ++ optional (!x11Support) "--without-x" # Building without this fails on Darwin with
#
# ./src/video/x11/SDL_x11sym.h:168:17: error: conflicting types for '_XData32'
# SDL_X11_SYM(int,_XData32,(Display *dpy,register long *data,unsigned len),(dpy,data,len),return)
#
# Please try revert the change that introduced this comment when updating SDL.
] ++ optional stdenv.isDarwin "--disable-x11-shared"
++ optional (!x11Support) "--without-x"
++ optional alsaSupport "--with-alsa-prefix=${attrs.alsaLib.out}/lib"; ++ optional alsaSupport "--with-alsa-prefix=${attrs.alsaLib.out}/lib";
in in
@ -41,7 +48,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
propagatedBuildInputs = [ ] propagatedBuildInputs = [ ]
++ optionals x11Support [ libXext libICE libXrandr ] ++ optionals (x11Support && !stdenv.isDarwin) [ libXext libICE libXrandr ]
++ optional stdenv.isLinux libcap ++ optional stdenv.isLinux libcap
++ optionals openglSupport [ libGL libGLU ] ++ optionals openglSupport [ libGL libGLU ]
++ optional alsaSupport alsaLib ++ optional alsaSupport alsaLib
@ -49,6 +56,7 @@ stdenv.mkDerivation rec {
++ optional stdenv.isDarwin Cocoa; ++ optional stdenv.isDarwin Cocoa;
buildInputs = [ libiconv ] buildInputs = [ libiconv ]
++ optionals (x11Support && stdenv.isDarwin) [ libXext libICE libXrandr ]
++ optional (!hostPlatform.isMinGW) audiofile ++ optional (!hostPlatform.isMinGW) audiofile
++ optionals stdenv.isDarwin [ AudioUnit CoreAudio CoreServices Kernel OpenGL ]; ++ optionals stdenv.isDarwin [ AudioUnit CoreAudio CoreServices Kernel OpenGL ];