From c857552da83e868176fd1fa139e070199b88fa8a Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 16 Apr 2016 20:53:46 +0300 Subject: treewide: Make explicit that 'dev' output of libX11 is used --- pkgs/applications/misc/gkrellm/default.nix | 2 +- pkgs/games/0ad/default.nix | 2 +- pkgs/misc/emulators/wxmupen64plus/default.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/gkrellm/default.nix b/pkgs/applications/misc/gkrellm/default.nix index 934a7c69c993..ac8f876ad3fc 100644 --- a/pkgs/applications/misc/gkrellm/default.nix +++ b/pkgs/applications/misc/gkrellm/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { echo "patching makefiles..." for i in Makefile src/Makefile server/Makefile do - sed -i "$i" -e "s|/usr/X11R6|${libX11}|g ; s|-lICE|-lX11 -lICE|g" + sed -i "$i" -e "s|/usr/X11R6|${libX11.dev}|g ; s|-lICE|-lX11 -lICE|g" done ''; buildPhase = '' diff --git a/pkgs/games/0ad/default.nix b/pkgs/games/0ad/default.nix index 485feb53a89b..1b9dbbc48a4c 100644 --- a/pkgs/games/0ad/default.nix +++ b/pkgs/games/0ad/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = [ "-I${xproto}/include/X11" - "-I${libX11}/include/X11" + "-I${libX11.dev}/include/X11" "-I${libXcursor}/include/X11" "-I${SDL}/include/SDL" "-I${SDL2}/include/SDL2" diff --git a/pkgs/misc/emulators/wxmupen64plus/default.nix b/pkgs/misc/emulators/wxmupen64plus/default.nix index 0366b9dd22ce..aec498b899e4 100644 --- a/pkgs/misc/emulators/wxmupen64plus/default.nix +++ b/pkgs/misc/emulators/wxmupen64plus/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { configurePhase = '' tar xf ${mupen64plus.src} APIDIR=$(eval echo `pwd`/mupen64plus*/source/mupen64plus-core/src/api) - export CXXFLAGS="-I${libX11}/include/X11 -DLIBDIR=\\\"${mupen64plus}/lib/\\\"" + export CXXFLAGS="-I${libX11.dev}/include/X11 -DLIBDIR=\\\"${mupen64plus}/lib/\\\"" export LDFLAGS="-lwx_gtk2u_adv-2.9" python waf configure --mupenapi=$APIDIR --wxconfig=`type -P wx-config` --prefix=$out ''; -- cgit 1.4.1