nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 15:03:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Tuomas Tynkkynen 2016-04-16 20:53:46 +03:00 committed by Vladimír Čunát
parent 7fb29bfa73
commit c857552da8
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/misc/gkrellm/default.nix
View File

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
echo "patching makefiles..." echo "patching makefiles..."
for i in Makefile src/Makefile server/Makefile for i in Makefile src/Makefile server/Makefile
do 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 ''; done '';
buildPhase = '' buildPhase = ''

2
pkgs/games/0ad/default.nix
View File

@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = [ NIX_CFLAGS_COMPILE = [
"-I${xproto}/include/X11" "-I${xproto}/include/X11"
"-I${libX11}/include/X11" "-I${libX11.dev}/include/X11"
"-I${libXcursor}/include/X11" "-I${libXcursor}/include/X11"
"-I${SDL}/include/SDL" "-I${SDL}/include/SDL"
"-I${SDL2}/include/SDL2" "-I${SDL2}/include/SDL2"

2
pkgs/misc/emulators/wxmupen64plus/default.nix
View File

@ -12,7 +12,7 @@ stdenv.mkDerivation {
configurePhase = '' configurePhase = ''
tar xf ${mupen64plus.src} tar xf ${mupen64plus.src}
APIDIR=$(eval echo `pwd`/mupen64plus*/source/mupen64plus-core/src/api) 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" export LDFLAGS="-lwx_gtk2u_adv-2.9"
python waf configure --mupenapi=$APIDIR --wxconfig=`type -P wx-config` --prefix=$out python waf configure --mupenapi=$APIDIR --wxconfig=`type -P wx-config` --prefix=$out
''; '';