SDL: remove cf-private
This commit is contained in:
parent
cbfbe9ca1e
commit
ee85cef108
|
@ -6,7 +6,6 @@
|
||||||
, libXext, libICE, libXrandr
|
, libXext, libICE, libXrandr
|
||||||
, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux && !stdenv.hostPlatform.isAndroid, libpulseaudio
|
, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux && !stdenv.hostPlatform.isAndroid, 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,11 +40,7 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
buildInputs = [ ]
|
buildInputs = [ ]
|
||||||
++ optional (!stdenv.hostPlatform.isMinGW && alsaSupport) audiofile
|
++ optional (!stdenv.hostPlatform.isMinGW && alsaSupport) audiofile
|
||||||
++ optionals stdenv.isDarwin [
|
++ optionals stdenv.isDarwin [ AudioUnit CoreAudio CoreServices Kernel OpenGL ];
|
||||||
AudioUnit CoreAudio CoreServices Kernel OpenGL
|
|
||||||
# Needed for NSDefaultRunLoopMode symbols.
|
|
||||||
cf-private
|
|
||||||
];
|
|
||||||
|
|
||||||
configureFlags = [
|
configureFlags = [
|
||||||
"--disable-oss"
|
"--disable-oss"
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux && !stdenv.hostPlatform.isAndroid
|
, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux && !stdenv.hostPlatform.isAndroid
|
||||||
, libpulseaudio
|
, libpulseaudio
|
||||||
, AudioUnit, Cocoa, CoreAudio, CoreServices, ForceFeedback, OpenGL
|
, AudioUnit, Cocoa, CoreAudio, CoreServices, ForceFeedback, OpenGL
|
||||||
, audiofile, cf-private, libiconv
|
, audiofile, libiconv
|
||||||
}:
|
}:
|
||||||
|
|
||||||
# NOTE: When editing this expression see if the same change applies to
|
# NOTE: When editing this expression see if the same change applies to
|
||||||
|
@ -58,11 +58,7 @@ stdenv.mkDerivation rec {
|
||||||
++ dlopenBuildInputs
|
++ dlopenBuildInputs
|
||||||
++ optional ibusSupport ibus
|
++ optional ibusSupport ibus
|
||||||
++ optional fcitxSupport fcitx
|
++ optional fcitxSupport fcitx
|
||||||
++ optionals stdenv.isDarwin [
|
++ optionals stdenv.isDarwin [ AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL ];
|
||||||
AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL
|
|
||||||
# Needed for NSDefaultRunLoopMode symbols.
|
|
||||||
cf-private
|
|
||||||
];
|
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
|
|
@ -13087,7 +13087,6 @@ in
|
||||||
schroedinger = callPackage ../development/libraries/schroedinger { };
|
schroedinger = callPackage ../development/libraries/schroedinger { };
|
||||||
|
|
||||||
SDL = callPackage ../development/libraries/SDL ({
|
SDL = callPackage ../development/libraries/SDL ({
|
||||||
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;
|
||||||
} // lib.optionalAttrs stdenv.hostPlatform.isAndroid {
|
} // lib.optionalAttrs stdenv.hostPlatform.isAndroid {
|
||||||
# libGLU doesn’t work with Android’s SDL
|
# libGLU doesn’t work with Android’s SDL
|
||||||
|
@ -13111,7 +13110,6 @@ in
|
||||||
SDL_ttf = callPackage ../development/libraries/SDL_ttf { };
|
SDL_ttf = callPackage ../development/libraries/SDL_ttf { };
|
||||||
|
|
||||||
SDL2 = callPackage ../development/libraries/SDL2 {
|
SDL2 = callPackage ../development/libraries/SDL2 {
|
||||||
inherit (darwin) cf-private;
|
|
||||||
inherit (darwin.apple_sdk.frameworks) AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL;
|
inherit (darwin.apple_sdk.frameworks) AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue