treewide: Fix output references to libX11
This commit is contained in:
parent
c3bcb4e1ce
commit
aef35c52f0
|
@ -46,8 +46,8 @@ stdenv.mkDerivation rec {
|
|||
|
||||
configureFlags = "
|
||||
--without-arts --disable-docs
|
||||
--x-includes=${libX11}/include
|
||||
--x-libraries=${libX11}/lib
|
||||
--x-includes=${libX11.dev}/include
|
||||
--x-libraries=${libX11.out}/lib
|
||||
--with-qt-dir=${qt3}
|
||||
";
|
||||
|
||||
|
|
|
@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
|
|||
patchPhase = ''
|
||||
sed -i config.h \
|
||||
-e 's|.*#define.*TKGATE_TCLTK_VERSIONS.*|#define TKGATE_TCLTK_VERSIONS "${tcl.release}"|' \
|
||||
-e 's|.*#define.*TKGATE_INCDIRS.*|#define TKGATE_INCDIRS "${tcl}/include ${tk}/include ${libiconvInc} ${libX11}/include"|' \
|
||||
-e 's|.*#define.*TKGATE_LIBDIRS.*|#define TKGATE_LIBDIRS "${tcl}/lib ${tk}/lib ${libiconvLib} ${libX11}/lib"|' \
|
||||
-e 's|.*#define.*TKGATE_INCDIRS.*|#define TKGATE_INCDIRS "${tcl}/include ${tk}/include ${libiconvInc} ${libX11.dev}/include"|' \
|
||||
-e 's|.*#define.*TKGATE_LIBDIRS.*|#define TKGATE_LIBDIRS "${tcl}/lib ${tk}/lib ${libiconvLib} ${libX11.out}/lib"|' \
|
||||
\
|
||||
-e '20 i #define TCL_LIBRARY "${tcl}/lib"' \
|
||||
-e '20 i #define TK_LIBRARY "${tk}/lib/${tk.libPrefix}"' \
|
||||
|
|
|
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
|||
sh autogen.sh
|
||||
'';
|
||||
|
||||
configureFlags = "--x-includes=${libX11}/include --x-libraries=${libX11}/lib";
|
||||
configureFlags = "--x-includes=${libX11.dev}/include --x-libraries=${libX11.out}/lib";
|
||||
|
||||
meta = {
|
||||
description = "High quality rendering engine for C++";
|
||||
|
|
|
@ -9,8 +9,8 @@ stdenv.mkDerivation {
|
|||
|
||||
configureFlags = "
|
||||
--disable-shm
|
||||
--x-includes=${libX11}/include
|
||||
--x-libraries=${libX11}/lib";
|
||||
--x-includes=${libX11.dev}/include
|
||||
--x-libraries=${libX11.out}/lib";
|
||||
|
||||
buildInputs = [libjpeg libXext libX11 xextproto libtiff libungif libpng];
|
||||
|
||||
|
|
Loading…
Reference in a new issue