diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2018-11-05 12:47:14 +0100 |
|---|---|---|
| committer | Daiderd Jordan <daiderd@gmail.com> | 2018-11-05 12:47:14 +0100 |
| commit | 7edfded9c3936f50fb227aabc6423f2736f07eae (patch) | |
| tree | 3a3b9110a2570510222461a799c88d12e2e8ab61 | |
| parent | fd1ffd0e0d8a701616cd51c33717f6ad4fdbd508 (diff) | |
| download | nixlib-7edfded9c3936f50fb227aabc6423f2736f07eae.tar nixlib-7edfded9c3936f50fb227aabc6423f2736f07eae.tar.gz nixlib-7edfded9c3936f50fb227aabc6423f2736f07eae.tar.bz2 nixlib-7edfded9c3936f50fb227aabc6423f2736f07eae.tar.lz nixlib-7edfded9c3936f50fb227aabc6423f2736f07eae.tar.xz nixlib-7edfded9c3936f50fb227aabc6423f2736f07eae.tar.zst nixlib-7edfded9c3936f50fb227aabc6423f2736f07eae.zip | |
SDL: include cf-private on darwin
It's not included implicitly by the frameworks anymore.
Undefined symbols for architecture x86_64:
"_NSDefaultRunLoopMode", referenced from:
_QZ_PumpEvents in SDL_QuartzEvents.o
"_OBJC_CLASS_$_NSArray", referenced from:
objc-class-ref in SDL_QuartzEvents.o
"_OBJC_CLASS_$_NSDate", referenced from:
objc-class-ref in SDL_QuartzEvents.o
ld: symbol(s) not found for architecture x86_64
| -rw-r--r-- | pkgs/development/libraries/SDL/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
2 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix index 7bbb1a5e1c92..08a52096d4b1 100644 --- a/pkgs/development/libraries/SDL/default.nix +++ b/pkgs/development/libraries/SDL/default.nix @@ -4,6 +4,7 @@ , x11Support ? stdenv.hostPlatform == stdenv.buildPlatform, libXext, libICE, libXrandr , pulseaudioSupport ? true, libpulseaudio , OpenGL, CoreAudio, CoreServices, AudioUnit, Kernel, Cocoa +, cf-private }: # NOTE: When editing this expression see if the same change applies to @@ -41,7 +42,11 @@ stdenv.mkDerivation rec { buildInputs = [ ] ++ optional (!stdenv.hostPlatform.isMinGW) audiofile - ++ optionals stdenv.isDarwin [ AudioUnit CoreAudio CoreServices Kernel OpenGL ]; + ++ optionals stdenv.isDarwin [ + AudioUnit CoreAudio CoreServices Kernel OpenGL + # Needed for NSDefaultRunLoopMode symbols. + cf-private + ]; configureFlags = [ "--disable-oss" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 153336c08aa1..0c61e47ce575 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12126,6 +12126,7 @@ with pkgs; alsaSupport = stdenv.isLinux; x11Support = !stdenv.isCygwin; pulseaudioSupport = config.pulseaudio or stdenv.isLinux; + inherit (darwin) cf-private; inherit (darwin.apple_sdk.frameworks) OpenGL CoreAudio CoreServices AudioUnit Kernel Cocoa; }; |