treewide: Make explicit that 'dev' output of SDL is used
This commit is contained in:
parent
298b479c22
commit
cc7c9f5676
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
|
|||||||
'';
|
'';
|
||||||
|
|
||||||
NIX_CFLAGS_COMPILE = ''
|
NIX_CFLAGS_COMPILE = ''
|
||||||
-I${SDL}/include/SDL
|
-I${SDL.dev}/include/SDL
|
||||||
-I${freetype.dev}include/freetype2
|
-I${freetype.dev}include/freetype2
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
|
|||||||
"-I${xproto}/include/X11"
|
"-I${xproto}/include/X11"
|
||||||
"-I${libX11.dev}/include/X11"
|
"-I${libX11.dev}/include/X11"
|
||||||
"-I${libXcursor.dev}/include/X11"
|
"-I${libXcursor.dev}/include/X11"
|
||||||
"-I${SDL}/include/SDL"
|
"-I${SDL.dev}/include/SDL"
|
||||||
"-I${SDL2}/include/SDL2"
|
"-I${SDL2}/include/SDL2"
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
prePatch = ''
|
prePatch = ''
|
||||||
sed -i Makefile -e 's,LIBTCODDIR=.*,LIBTCODDIR=${libtcod},g' \
|
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"
|
sed -i src/platform/tcod-platform.c -e "s,fonts/font,$out/share/brogue/fonts/font,g"
|
||||||
make clean
|
make clean
|
||||||
rm -rf src/libtcod*
|
rm -rf src/libtcod*
|
||||||
|
Loading…
x
Reference in New Issue
Block a user