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

SDL: propagate X11 libs even when building statically against them on Darwin

Browse Source 
Packages like SDL_image, SDL_mixer, SDL_net, SDL_ttf depend on this.

This reverts a piece of 19130ebc5d.
This commit is contained in:
Jan Malakhovski 2018-03-08 11:21:04 +00:00
parent 19130ebc5d
commit 2e3077c907
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
propagatedBuildInputs = [ ]
++ optionals (x11Support && !stdenv.isDarwin) [ libXext libICE libXrandr ]
++ optionals x11Support [ libXext libICE libXrandr ]
++ optional stdenv.isLinux libcap
++ optionals openglSupport [ libGL libGLU ]
++ optional alsaSupport alsaLib
@ -56,7 +56,6 @@ 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 ];