diff options
| author | Jan Malakhovski <oxij@oxij.org> | 2018-03-06 15:35:27 +0000 |
|---|---|---|
| committer | Jan Malakhovski <oxij@oxij.org> | 2018-03-06 15:57:27 +0000 |
| commit | 19130ebc5d05cc7720335c92d68a4fd1faf28dc0 (patch) | |
| tree | 3a38b6b774f41d20afe5965695a8d9298961f9fb /pkgs/development/libraries/SDL | |
| parent | 39319f3a7598940218eab9b3ec6d4dd388627abe (diff) | |
SDL: build statically against x11 on Darwin
Diffstat (limited to 'pkgs/development/libraries/SDL')
| -rw-r--r-- | pkgs/development/libraries/SDL/default.nix | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix index 2e6c78fdf2397..0b853aad8ef89 100644 --- a/pkgs/development/libraries/SDL/default.nix +++ b/pkgs/development/libraries/SDL/default.nix @@ -21,7 +21,14 @@ let "--disable-oss" "--disable-video-x11-xme" "--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"; in @@ -41,7 +48,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ ] - ++ optionals x11Support [ libXext libICE libXrandr ] + ++ optionals (x11Support && !stdenv.isDarwin) [ libXext libICE libXrandr ] ++ optional stdenv.isLinux libcap ++ optionals openglSupport [ libGL libGLU ] ++ optional alsaSupport alsaLib @@ -49,6 +56,7 @@ stdenv.mkDerivation rec { ++ optional stdenv.isDarwin Cocoa; buildInputs = [ libiconv ] + ++ optionals (x11Support && stdenv.isDarwin) [ libXext libICE libXrandr ] ++ optional (!hostPlatform.isMinGW) audiofile ++ optionals stdenv.isDarwin [ AudioUnit CoreAudio CoreServices Kernel OpenGL ]; |