diff --git a/pkgs/gtk+/gtk+-build.sh b/pkgs/gtk+/gtk+-build.sh index db42040f0f1..6ae4ffbdade 100755 --- a/pkgs/gtk+/gtk+-build.sh +++ b/pkgs/gtk+/gtk+-build.sh @@ -8,7 +8,8 @@ envpkgs="$glib $atk $pango" tar xvfj $src || exit 1 cd gtk+-* || exit 1 -LDFLAGS=-s ./configure --prefix=$out --x-includes=/usr/X11/include --x-libraries=/usr/X11/lib || exit 1 +LDFLAGS=-Wl,-s ./configure --prefix=$out --x-includes=/usr/X11/include --x-libraries=/usr/X11/lib || exit 1 make || exit 1 make install || exit 1 + echo $envpkgs > $out/envpkgs || exit 1 diff --git a/pkgs/pango/pango-build.sh b/pkgs/pango/pango-build.sh index 40c7f71e459..82e38a8223f 100755 --- a/pkgs/pango/pango-build.sh +++ b/pkgs/pango/pango-build.sh @@ -2,7 +2,7 @@ . $stdenv/setup || exit 1 -export PATH=$pkgconfig/bin:$PATH +export PATH=$pkgconfig/bin:/bin:/usr/bin envpkgs="$glib $Xft" . $setenv diff --git a/pkgs/stdenv/stdenv-build.sh b/pkgs/stdenv/stdenv-build.sh index a266e1ff445..8d3a7ae7b28 100755 --- a/pkgs/stdenv/stdenv-build.sh +++ b/pkgs/stdenv/stdenv-build.sh @@ -15,8 +15,10 @@ sed \ < $gccwrapper > $out/bin/gcc || exit 1 chmod +x $out/bin/gcc || exit 1 +gplusplus=/usr/bin/g++ + sed \ - -e s^@GCC\@^$g++^g \ + -e s^@GCC\@^$gplusplus^g \ -e s^@LIBC\@^$glibc^g \ < $gccwrapper > $out/bin/g++ || exit 1 chmod +x $out/bin/g++ || exit 1 diff --git a/pkgs/subversion/subversion-build.sh b/pkgs/subversion/subversion-build.sh index 1ef53582c1f..8da5e692b16 100755 --- a/pkgs/subversion/subversion-build.sh +++ b/pkgs/subversion/subversion-build.sh @@ -26,7 +26,8 @@ echo "extra flags: $extraflags" tar xvfz $src || exit 1 cd subversion-* || exit 1 -LDFLAGS=-Wl,-S ./configure --prefix=$out $extraflags --without-gdbm || exit 1 +LDFLAGS=-Wl,-S ./configure --prefix=$out $extraflags \ + --without-gdbm --disable-static || exit 1 make $extramakeflags || exit 1 make install $extramakeflags || exit 1 diff --git a/pkgs/system/system.fix b/pkgs/system/system.fix index 2ec54ffe3fb..52abfdaa6a6 100644 --- a/pkgs/system/system.fix +++ b/pkgs/system/system.fix @@ -8,5 +8,6 @@ Package( , ("actPan", IncludeFix("pan/pan.fix")) , ("actMPlayer", IncludeFix("MPlayer/MPlayer.fix")) , ("actSylpheed", IncludeFix("sylpheed/sylpheed.fix")) + , ("actXslt", IncludeFix("libxslt/libxslt.fix")) ] )