treewide: replace references to SDL.dev with lib.getDev SDL
This commit is contained in:
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
# pass in correct sdl-config for cross builds
|
||||
env.SDL_CONFIG = lib.getExe' SDL.dev "sdl-config";
|
||||
env.SDL_CONFIG = lib.getExe' (lib.getDev SDL) "sdl-config";
|
||||
|
||||
makeFlags = [
|
||||
"AR=${stdenv.cc.targetPrefix}ar"
|
||||
|
||||
@@ -56,7 +56,7 @@ stdenv.mkDerivation {
|
||||
zlib
|
||||
] ++ lib.optional stdenv.hostPlatform.isDarwin libiconv;
|
||||
|
||||
env.SDL_CONFIG = lib.getExe' SDL.dev "sdl-config";
|
||||
env.SDL_CONFIG = lib.getExe' (lib.getDev SDL) "sdl-config";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
||||
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
makeFlags = [ "AR=${stdenv.cc.targetPrefix}ar" ];
|
||||
|
||||
env.SDL_CONFIG = lib.getExe' SDL.dev "sdl-config";
|
||||
env.SDL_CONFIG = lib.getExe' (lib.getDev SDL) "sdl-config";
|
||||
|
||||
buildInputs = [
|
||||
SDL
|
||||
|
||||
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
SDL.dev
|
||||
(lib.getDev SDL)
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
SDL.dev
|
||||
(lib.getDev SDL)
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# SDL_gfx.pc refers to sdl.pc and some SDL_gfx headers import SDL.h
|
||||
propagatedBuildInputs = [ SDL ];
|
||||
|
||||
env.SDL_CONFIG = lib.getExe' SDL.dev "sdl-config";
|
||||
env.SDL_CONFIG = lib.getExe' (lib.getDev SDL) "sdl-config";
|
||||
|
||||
configureFlags = [
|
||||
(lib.enableFeature false "mmx")
|
||||
|
||||
@@ -83,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
|
||||
# pass in correct *-config for cross builds
|
||||
env.SDL_CONFIG = lib.getExe' SDL.dev "sdl-config";
|
||||
env.SDL_CONFIG = lib.getExe' (lib.getDev SDL) "sdl-config";
|
||||
env.SMPEG_CONFIG = lib.getExe' smpeg.dev "smpeg-config";
|
||||
|
||||
configureFlags = [
|
||||
|
||||
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
(lib.enableFeature enableSdltest "sdltest")
|
||||
];
|
||||
|
||||
env.SDL_CONFIG = lib.getExe' SDL.dev "sdl-config";
|
||||
env.SDL_CONFIG = lib.getExe' (lib.getDev SDL) "sdl-config";
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
|
||||
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
|
||||
# pass in correct *-config for cross builds
|
||||
env.SDL_CONFIG = lib.getExe' SDL.dev "sdl-config";
|
||||
env.SDL_CONFIG = lib.getExe' (lib.getDev SDL) "sdl-config";
|
||||
env.FREETYPE_CONFIG = lib.getExe' freetype.dev "freetype-config";
|
||||
|
||||
configureFlags = [
|
||||
|
||||
@@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
SDL.dev
|
||||
(lib.getDev SDL)
|
||||
SDL_image
|
||||
SDL_ttf
|
||||
SDL_mixer
|
||||
|
||||
@@ -108,7 +108,7 @@ buildPythonPackage rec {
|
||||
|
||||
export DOXYGEN=${doxygen}/bin/doxygen
|
||||
export PATH="${wxGTK}/bin:$PATH"
|
||||
export SDL_CONFIG="${SDL.dev}/bin/sdl-config"
|
||||
export SDL_CONFIG="${lib.getExe' (lib.getDev SDL) "sdl-config"}"
|
||||
export WAF=$PWD/bin/waf
|
||||
|
||||
${python.pythonOnBuildForHost.interpreter} build.py -v --use_syswx dox etg sip --nodoc build_py
|
||||
|
||||
Reference in New Issue
Block a user