diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2018-11-06 20:15:27 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-06 20:15:27 +0100 |
| commit | b6dcb9e641950d1ce2e56724573e77b9999ed043 (patch) | |
| tree | 2cd39e9aa154c731fa67ac663e1895f0f4cf77b6 /pkgs/development/libraries/SDL2 | |
| parent | aed2dea55a9399c9513e65ff8248aff0205b5a3e (diff) | |
| parent | ecf7c9c4b4e7f5b3737cb4a92570333fde7684c0 (diff) | |
| download | nixpkgs-b6dcb9e641950d1ce2e56724573e77b9999ed043.tar nixpkgs-b6dcb9e641950d1ce2e56724573e77b9999ed043.tar.gz nixpkgs-b6dcb9e641950d1ce2e56724573e77b9999ed043.tar.bz2 nixpkgs-b6dcb9e641950d1ce2e56724573e77b9999ed043.tar.lz nixpkgs-b6dcb9e641950d1ce2e56724573e77b9999ed043.tar.xz nixpkgs-b6dcb9e641950d1ce2e56724573e77b9999ed043.tar.zst nixpkgs-b6dcb9e641950d1ce2e56724573e77b9999ed043.zip | |
Merge pull request #49768 from LnL7/darwin-no-cfprivate
darwin: don't include cf-private in framework dependencies
Diffstat (limited to 'pkgs/development/libraries/SDL2')
| -rw-r--r-- | pkgs/development/libraries/SDL2/default.nix | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index d445e1ab917..07a63a366f1 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -1,20 +1,20 @@ -{ stdenv, lib, fetchurl, pkgconfig, pruneLibtoolFiles -, openglSupport ? false, libGL -, alsaSupport ? true, alsaLib -, x11Support ? true, libX11, xproto, libICE, libXi, libXScrnSaver, libXcursor, libXinerama, libXext, libXxf86vm, libXrandr -, waylandSupport ? true, wayland, wayland-protocols, libxkbcommon -, dbusSupport ? false, dbus +{ stdenv, config, libGLSupported, fetchurl, pkgconfig, pruneLibtoolFiles +, openglSupport ? libGLSupported, libGL +, alsaSupport ? stdenv.isLinux, alsaLib +, x11Support ? !stdenv.isCygwin, libX11, xproto, libICE, libXi, libXScrnSaver, libXcursor, libXinerama, libXext, libXxf86vm, libXrandr +, waylandSupport ? stdenv.isLinux, wayland, wayland-protocols, libxkbcommon +, dbusSupport ? stdenv.isLinux, dbus , udevSupport ? false, udev , ibusSupport ? false, ibus -, pulseaudioSupport ? true, libpulseaudio +, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio , AudioUnit, Cocoa, CoreAudio, CoreServices, ForceFeedback, OpenGL -, audiofile, libiconv +, audiofile, cf-private, libiconv }: # NOTE: When editing this expression see if the same change applies to # SDL expression too -with lib; +with stdenv.lib; assert !stdenv.isDarwin -> alsaSupport || pulseaudioSupport; assert openglSupport -> (stdenv.isDarwin || x11Support && libGL != null); @@ -54,7 +54,11 @@ stdenv.mkDerivation rec { buildInputs = [ audiofile libiconv ] ++ dlopenBuildInputs ++ optional ibusSupport ibus - ++ optionals stdenv.isDarwin [ AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL ]; + ++ optionals stdenv.isDarwin [ + AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL + # Needed for NSDefaultRunLoopMode symbols. + cf-private + ]; # /build/SDL2-2.0.7/src/video/wayland/SDL_waylandevents.c:41:10: fatal error: # pointer-constraints-unstable-v1-client-protocol.h: No such file or directory |