From cc7c9f567601d90b742f20c540a40dea6a38e59a Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Tue, 23 Aug 2016 03:26:46 +0300
Subject: [PATCH] treewide: Make explicit that 'dev' output of SDL is used
---
pkgs/development/interpreters/love/0.7.nix | 2 +-
pkgs/games/0ad/default.nix | 2 +-
pkgs/games/brogue/default.nix | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/development/interpreters/love/0.7.nix b/pkgs/development/interpreters/love/0.7.nix
index 76b08cd35c60..8053c82e90e6 100644
--- a/pkgs/development/interpreters/love/0.7.nix
+++ b/pkgs/development/interpreters/love/0.7.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
'';
NIX_CFLAGS_COMPILE = ''
- -I${SDL}/include/SDL
+ -I${SDL.dev}/include/SDL
-I${freetype.dev}include/freetype2
'';
diff --git a/pkgs/games/0ad/default.nix b/pkgs/games/0ad/default.nix
index 482d2b43df38..0a2c342e8ed4 100644
--- a/pkgs/games/0ad/default.nix
+++ b/pkgs/games/0ad/default.nix
@@ -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"
];
diff --git a/pkgs/games/brogue/default.nix b/pkgs/games/brogue/default.nix
index 134e94d1fc28..73a70f2f37e1 100644
--- a/pkgs/games/brogue/default.nix
+++ b/pkgs/games/brogue/default.nix
@@ -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*