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

Merge branch 'master' into staging

Browse Source
This commit is contained in:
Vladimír Čunát
2016-02-07 13:52:42 +01:00
parent 234f461139 98ffc61e2f
commit a115bff08c
514 changed files with 24027 additions and 15228 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/SDL/default.nix
+3 -2
View File
@@ -37,12 +37,13 @@ stdenv.mkDerivation rec {
optional alsaSupport alsaLib ++
optional stdenv.isLinux libcap ++
optional openglSupport mesa ++
optional pulseaudioSupport libpulseaudio;
optional pulseaudioSupport libpulseaudio ++
optional stdenv.isDarwin Cocoa;
buildInputs = let
notMingw = !(stdenv ? cross) || stdenv.cross.libc != "msvcrt";
in optional notMingw audiofile
++ optionals stdenv.isDarwin [ OpenGL CoreAudio CoreServices AudioUnit Kernel Cocoa ];
++ optionals stdenv.isDarwin [ OpenGL CoreAudio CoreServices AudioUnit Kernel ];
# XXX: By default, SDL wants to dlopen() PulseAudio, in which case
# we must arrange to add it to its RPATH; however, `patchelf' seems