diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-02-07 13:52:42 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-02-07 13:52:42 +0100 |
| commit | a115bff08c1f2046957d09a6a908202d1b98c311 (patch) | |
| tree | e15cfb7f524284fcefa5119e7ee0abe2ae1096d9 /pkgs/development/libraries/SDL | |
| parent | 234f4611393a6818b317f3ad93d2e276515bdc33 (diff) | |
| parent | 98ffc61e2f846c4818280a4cccce3fdad3eb9677 (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/development/libraries/SDL')
| -rw-r--r-- | pkgs/development/libraries/SDL/default.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix index 3b63e0bbb0a87..7ca594e9bc4a3 100644 --- a/pkgs/development/libraries/SDL/default.nix +++ b/pkgs/development/libraries/SDL/default.nix @@ -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 |