ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-25 20:34:52 +03:00
Code Issues Projects Releases Wiki Activity

treewide: Fix output references to libX11

Browse Source
This commit is contained in:
Tuomas Tynkkynen 2016-08-30 03:31:55 +03:00
parent c3bcb4e1ce
commit aef35c52f0
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/misc/taskjuggler/default.nix
View File

@ -46,8 +46,8 @@ stdenv.mkDerivation rec {
configureFlags = " configureFlags = "
--without-arts --disable-docs --without-arts --disable-docs
--x-includes=${libX11}/include --x-includes=${libX11.dev}/include
--x-libraries=${libX11}/lib --x-libraries=${libX11.out}/lib
--with-qt-dir=${qt3} --with-qt-dir=${qt3}
"; ";

4
pkgs/applications/science/electronics/tkgate/1.x.nix
View File

@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
patchPhase = '' patchPhase = ''
sed -i config.h \ sed -i config.h \
-e 's|.*#define.*TKGATE_TCLTK_VERSIONS.*|#define TKGATE_TCLTK_VERSIONS "${tcl.release}"|' \ -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_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}/lib"|' \ -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 TCL_LIBRARY "${tcl}/lib"' \
-e '20 i #define TK_LIBRARY "${tk}/lib/${tk.libPrefix}"' \ -e '20 i #define TK_LIBRARY "${tk}/lib/${tk.libPrefix}"' \

2
pkgs/development/libraries/agg/default.nix
View File

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
sh autogen.sh sh autogen.sh
''; '';
configureFlags = "--x-includes=${libX11}/include --x-libraries=${libX11}/lib"; configureFlags = "--x-includes=${libX11.dev}/include --x-libraries=${libX11.out}/lib";
meta = { meta = {
description = "High quality rendering engine for C++"; description = "High quality rendering engine for C++";

4
pkgs/development/libraries/imlib/default.nix
View File

@ -9,8 +9,8 @@ stdenv.mkDerivation {
configureFlags = " configureFlags = "
--disable-shm --disable-shm
--x-includes=${libX11}/include --x-includes=${libX11.dev}/include
--x-libraries=${libX11}/lib"; --x-libraries=${libX11.out}/lib";
buildInputs = [libjpeg libXext libX11 xextproto libtiff libungif libpng]; buildInputs = [libjpeg libXext libX11 xextproto libtiff libungif libpng];