* Fix a typo in the g++ wrapper.

svn path=/nixpkgs/trunk/; revision=207
This commit is contained in:
Eelco Dolstra 2003-07-26 20:38:23 +00:00
parent eeabccf147
commit a7e18d28f5
5 changed files with 9 additions and 4 deletions

View file

@ -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

View file

@ -2,7 +2,7 @@
. $stdenv/setup || exit 1
export PATH=$pkgconfig/bin:$PATH
export PATH=$pkgconfig/bin:/bin:/usr/bin
envpkgs="$glib $Xft"
. $setenv

View file

@ -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

View file

@ -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

View file

@ -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"))
]
)