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

Merge pull request #36514 from oxij/pkgs/fix-pulseaudio-references-fix

Browse Source 
SDL: propagate X11 libs even when building statically against them on Darwin
This commit is contained in:
Michael Raskin 2018-03-08 15:31:30 +00:00 committed by GitHub
commit b61ac66973
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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 ]; nativeBuildInputs = [ pkgconfig ];
propagatedBuildInputs = [ ] propagatedBuildInputs = [ ]
++ optionals (x11Support && !stdenv.isDarwin) [ libXext libICE libXrandr ] ++ optionals x11Support [ 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
@ -56,7 +56,6 @@ 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 ];