BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

SDL: include cf-private on darwin

Browse source 
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
This commit is contained in:
Daiderd Jordan 2018-11-05 12:47:14 +01:00
parent fd1ffd0e0d
commit 7edfded9c3
No known key found for this signature in database
GPG key ID: D02435D05B810C96
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgs/development/libraries/SDL/default.nix
View file

@ -4,6 +4,7 @@
, x11Support ? stdenv.hostPlatform == stdenv.buildPlatform, libXext, libICE, libXrandr , x11Support ? stdenv.hostPlatform == stdenv.buildPlatform, libXext, libICE, libXrandr
, pulseaudioSupport ? true, libpulseaudio , pulseaudioSupport ? true, libpulseaudio
, OpenGL, CoreAudio, CoreServices, AudioUnit, Kernel, Cocoa , OpenGL, CoreAudio, CoreServices, AudioUnit, Kernel, Cocoa
, cf-private
}: }:
# NOTE: When editing this expression see if the same change applies to # NOTE: When editing this expression see if the same change applies to
@ -41,7 +42,11 @@ stdenv.mkDerivation rec {
buildInputs = [ ] buildInputs = [ ]
++ optional (!stdenv.hostPlatform.isMinGW) audiofile ++ 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 = [ configureFlags = [
"--disable-oss" "--disable-oss"

1
pkgs/top-level/all-packages.nix
View file

@ -12126,6 +12126,7 @@ with pkgs;
alsaSupport = stdenv.isLinux; alsaSupport = stdenv.isLinux;
x11Support = !stdenv.isCygwin; x11Support = !stdenv.isCygwin;
pulseaudioSupport = config.pulseaudio or stdenv.isLinux; pulseaudioSupport = config.pulseaudio or stdenv.isLinux;
inherit (darwin) cf-private;
inherit (darwin.apple_sdk.frameworks) OpenGL CoreAudio CoreServices AudioUnit Kernel Cocoa; inherit (darwin.apple_sdk.frameworks) OpenGL CoreAudio CoreServices AudioUnit Kernel Cocoa;
}; };