pyrox.dev / nixpkgs
lol
fork atom

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

authored by

Tuomas Tynkkynen and committed by
Vladimír Čunát c857552d 7fb29bfa

+3 -3
unified split
+1 -1
pkgs/applications/misc/gkrellm/default.nix
··· 15 15 echo "patching makefiles..." 16 16 for i in Makefile src/Makefile server/Makefile 17 17 do 18 - sed -i "$i" -e "s|/usr/X11R6|${libX11}|g ; s|-lICE|-lX11 -lICE|g" 18 + sed -i "$i" -e "s|/usr/X11R6|${libX11.dev}|g ; s|-lICE|-lX11 -lICE|g" 19 19 done ''; 20 20 21 21 buildPhase = ''
+1 -1
pkgs/games/0ad/default.nix
··· 37 37 38 38 NIX_CFLAGS_COMPILE = [ 39 39 "-I${xproto}/include/X11" 40 - "-I${libX11}/include/X11" 40 + "-I${libX11.dev}/include/X11" 41 41 "-I${libXcursor}/include/X11" 42 42 "-I${SDL}/include/SDL" 43 43 "-I${SDL2}/include/SDL2"
+1 -1
pkgs/misc/emulators/wxmupen64plus/default.nix
··· 12 12 configurePhase = '' 13 13 tar xf ${mupen64plus.src} 14 14 APIDIR=$(eval echo `pwd`/mupen64plus*/source/mupen64plus-core/src/api) 15 - export CXXFLAGS="-I${libX11}/include/X11 -DLIBDIR=\\\"${mupen64plus}/lib/\\\"" 15 + export CXXFLAGS="-I${libX11.dev}/include/X11 -DLIBDIR=\\\"${mupen64plus}/lib/\\\"" 16 16 export LDFLAGS="-lwx_gtk2u_adv-2.9" 17 17 python waf configure --mupenapi=$APIDIR --wxconfig=`type -P wx-config` --prefix=$out 18 18 '';