mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-20 12:42:24 +00:00
GCJ 4.4: Tell GCC about the path to the X libs.
svn path=/nixpkgs/trunk/; revision=16500
This commit is contained in:
parent
8f6228ee5b
commit
0b235f3ec5
|
@ -48,8 +48,15 @@ if test "$noSysDirs" = "1"; then
|
|||
export LIBRARY_PATH="$glibc_libdir"
|
||||
|
||||
if test "$langJava" = "1"; then
|
||||
export CPATH="$CPATH:$zlib/include:$boehmgc/include"
|
||||
export LIBRARY_PATH="$LIBRARY_PATH:$zlib/lib:$boehmgc/lib"
|
||||
for lib in "$zlib" "$boehmgc" "$libX11" "$libXt" "$libSM" \
|
||||
"$libICE" "$libXtst"
|
||||
do
|
||||
if test -n "$lib"
|
||||
then
|
||||
export CPATH="$CPATH:$lib/include"
|
||||
export LIBRARY_PATH="$LIBRARY_PATH:$lib/lib"
|
||||
fi
|
||||
done
|
||||
fi
|
||||
|
||||
echo "setting \$CPATH to \`$CPATH'"
|
||||
|
|
|
@ -101,7 +101,8 @@ stdenv.mkDerivation ({
|
|||
";
|
||||
|
||||
inherit gmp mpfr zlib boehmgc;
|
||||
|
||||
inherit libX11 libXt libSM libICE libXtst;
|
||||
|
||||
passthru = { inherit langC langCC langFortran langTreelang enableMultilib; };
|
||||
|
||||
meta = {
|
||||
|
|
Loading…
Reference in a new issue