treewide: Make explicit that 'dev' output of SDL is used

This commit is contained in:
Tuomas Tynkkynen 2016-08-23 03:26:46 +03:00
parent 298b479c22
commit cc7c9f5676
3 changed files with 3 additions and 3 deletions

View file

@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
'';
NIX_CFLAGS_COMPILE = ''
-I${SDL}/include/SDL
-I${SDL.dev}/include/SDL
-I${freetype.dev}include/freetype2
'';

View file

@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
"-I${xproto}/include/X11"
"-I${libX11.dev}/include/X11"
"-I${libXcursor.dev}/include/X11"
"-I${SDL}/include/SDL"
"-I${SDL.dev}/include/SDL"
"-I${SDL2}/include/SDL2"
];

View file

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
prePatch = ''
sed -i Makefile -e 's,LIBTCODDIR=.*,LIBTCODDIR=${libtcod},g' \
-e 's,sdl-config,${SDL}/bin/sdl-config,g'
-e 's,sdl-config,${SDL.dev}/bin/sdl-config,g'
sed -i src/platform/tcod-platform.c -e "s,fonts/font,$out/share/brogue/fonts/font,g"
make clean
rm -rf src/libtcod*