* Updated packages to use our own glibc.

* Disabled gtkspell support in pan since it (and it alone) has a conflict with the 
  system glibc.
* Use CPU detection in MPlayer so that it also works on systems with different CPUs 
  than the build system's.

svn path=/nixpkgs/trunk/; revision=206

pkgs/MPlayer/MPlayer-build.sh

@@ -1,6 +1,7 @@
 #! /bin/sh
 
-export PATH=/bin:/usr/bin
+. $stdenv/setup || exit 1
+
 envpkgs="$freetype"
 . $setenv
 
@@ -11,8 +12,11 @@ cd MPlayer-* || exit 1
  --with-reallibdir=$win32codecs \
  --disable-sdl --disable-esd --disable-xanim --disable-cdparanoia --disable-directfb \
  --disable-lirc --disable-svga --disable-libdv \
+ --disable-vorbis --disable-png --disable-jpeg --disable-gif \
+ --enable-runtime-cpudetection \
  || exit 1
 make || exit 1
 make install || exit 1
 cp -p ../font-arial-iso-8859-1/font-arial-18-iso-8859-1/* $out/share/mplayer/font || exit 1
+
 echo $envpkgs > $out/envpkgs || exit 1

pkgs/MPlayer/MPlayer.fix

@@ -14,6 +14,7 @@ Package(
       , ("md5", "1ecd31d17b51f16332b1fcc7da36b312")
       ]))
 
+  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
   , ("freetype", IncludeFix("freetype/freetype.fix"))
   , ("win32codecs", IncludeFix("win32codecs/win32codecs.fix"))
   ]

pkgs/Xft/Xft-build.sh

@@ -1,12 +1,13 @@
 #! /bin/sh
 
-export PATH=/bin:/usr/bin
+. $stdenv/setup || exit 1
+
 envpkgs=$fontconfig
 . $setenv
 
 tar xvfz $src || exit 1
 cd fcpackage*/Xft || exit 1
-./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

pkgs/Xft/Xft.fix

@@ -9,6 +9,7 @@ Package(
       , ("md5", "2f2852c80924a9b5356c3037a471c1a1")
       ]))
 
+  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
   , ("fontconfig", IncludeFix("fontconfig/fontconfig.fix"))
   ]
 )

pkgs/atk/atk-build.sh

@@ -1,12 +1,14 @@
 #! /bin/sh
 
-export PATH=$pkgconfig/bin:/bin:/usr/bin
+. $stdenv/setup || exit 1
+
+export PATH=$pkgconfig/bin:$PATH
 envpkgs=$glib
 . $setenv
 
 tar xvfj $src || exit 1
 cd atk-* || exit 1
-LDFLAGS=-s ./configure --prefix=$out || exit 1
+LDFLAGS=-Wl,-S ./configure --prefix=$out || exit 1
 make || exit 1
 make install || exit 1
 echo $envpkgs > $out/envpkgs || exit 1

pkgs/atk/atk.fix

@@ -9,6 +9,7 @@ Package(
       , ("md5", "2d6d50df31abe0e8892b5d3e7676a02d")
       ]))
 
+  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
   , ("pkgconfig", IncludeFix("pkgconfig/pkgconfig.fix"))
   , ("glib", IncludeFix("glib/glib.fix"))
   ]

pkgs/fontconfig/fontconfig-build.sh

@@ -1,12 +1,13 @@
 #! /bin/sh
 
-export PATH=/bin:/usr/bin
+. $stdenv/setup || exit 1
+
 envpkgs=$freetype
 . $setenv
 
 tar xvfz $src || exit 1
 cd fcpackage*/fontconfig || exit 1
-./configure --prefix=$out --with-confdir=$out/etc/fonts --x-includes=/usr/X11/include --x-libraries=/usr/X11/lib || exit 1
+LDFLAGS=-Wl,-S ./configure --prefix=$out --with-confdir=$out/etc/fonts --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

pkgs/fontconfig/fontconfig.fix

@@ -9,6 +9,7 @@ Package(
       , ("md5", "2f2852c80924a9b5356c3037a471c1a1")
       ]))
 
+  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
   , ("freetype", IncludeFix("freetype/freetype.fix"))
   ]
 )

pkgs/freetype/freetype-build.sh

@@ -1,9 +1,10 @@
 #! /bin/sh
 
-export PATH=/bin:/usr/bin
+. $stdenv/setup || exit 1
 
 tar xvfj $src || exit 1
 cd freetype-* || exit 1
-./configure --prefix=$out || exit 1
+LDFLAGS=-Wl,-S ./configure --prefix=$out || exit 1
 make || exit 1
 make install || exit 1
+strip -S $out/lib/*.a || exit 1

pkgs/freetype/freetype.fix

@@ -1,9 +1,12 @@
 Package(
   [ ("name", "freetype-2.1.4")
   , ("build", Relative("freetype/freetype-build.sh"))
+
   , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
       [ ("url", "http://easynews.dl.sourceforge.net/sourceforge/freetype/freetype-2.1.4.tar.bz2")
       , ("md5", "1fc0b188f1fe1216776e5855d2da141f")
       ]))
+
+  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
   ]
 )

pkgs/glib-1/glib-build.sh

@@ -1,9 +1,9 @@
 #! /bin/sh
 
-export PATH=/bin:/usr/bin
+. $stdenv/setup || exit 1
 
 tar xvfz $src || exit 1
 cd glib-* || exit 1
-LDFLAGS=-s ./configure --prefix=$out || exit 1
+LDFLAGS=-Wl,-S ./configure --prefix=$out || exit 1
 make || exit 1
 make install || exit 1

pkgs/glib-1/glib.fix

@@ -1,11 +1,12 @@
 Package(
   [ ("name", "glib-1.2.10")
-
   , ("build", Relative("glib-1/glib-build.sh"))
 
   , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
       [ ("url", "ftp://ftp.gtk.org/pub/gtk/v1.2/glib-1.2.10.tar.gz")
       , ("md5", "6fe30dad87c77b91b632def29dd69ef9")
       ]))
+
+  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
   ]
 )

pkgs/glib/glib-build.sh

@@ -1,9 +1,11 @@
 #! /bin/sh
 
-export PATH=$pkgconfig/bin:/bin:/usr/bin
+. $stdenv/setup || exit 1
+
+export PATH=$pkgconfig/bin:$PATH
 
 tar xvfj $src || exit 1
 cd glib-* || exit 1
-LDFLAGS=-s ./configure --prefix=$out || exit 1
+LDFLAGS=-Wl,-S ./configure --prefix=$out || exit 1
 make || exit 1
 make install || exit 1

pkgs/glib/glib.fix

@@ -8,6 +8,7 @@ Package(
       , ("md5", "3e9a9512943c81a78cafa0536dcc8b41")
       ]))
 
+  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
   , ("pkgconfig", IncludeFix("pkgconfig/pkgconfig.fix"))
   ]
 )

pkgs/gnet/gnet-build.sh

@@ -1,12 +1,14 @@
 #! /bin/sh
 
+. $stdenv/setup || exit 1
+
 export PATH=$pkgconfig/bin:/bin:/usr/bin
 envpkgs=$glib
-. $setenv
+. $setenv || exit 1
 
 tar xvfz $src || exit 1
 cd gnet-* || exit 1
-LDFLAGS=-s ./configure --prefix=$out || exit 1
+LDFLAGS=-Wl,-S ./configure --prefix=$out || exit 1
 make || exit 1
 make install || exit 1
 echo $envpkgs > $out/envpkgs || exit 1

pkgs/gnet/gnet.fix

@@ -9,6 +9,7 @@ Package(
       , ("md5", "381b5c6d4031806fc4c3e6b28dc752ec")
       ]))
 
+  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
   , ("pkgconfig", IncludeFix("pkgconfig/pkgconfig.fix"))
   , ("glib", IncludeFix("glib/glib.fix"))
   ]

pkgs/gtk+-1/gtk+-build.sh

@@ -1,8 +1,9 @@
 #! /bin/sh
 
-export PATH=/bin:/usr/bin
+. $stdenv/setup || exit 1
+
 envpkgs="$glib"
-. $setenv
+. $setenv || exit 1
 
 tar xvfz $src || exit 1
 cd gtk+-* || exit 1

pkgs/gtk+-1/gtk+.fix

@@ -9,6 +9,7 @@ Package(
       , ("md5", "4d5cb2fc7fb7830e4af9747a36bfce20")
       ]))
 
+  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
   , ("glib", IncludeFix("glib-1/glib.fix"))
   ]
 )

pkgs/gtk+/gtk+-build.sh

@@ -1,5 +1,7 @@
 #! /bin/sh
 
+. $stdenv/setup || exit 1
+
 export PATH=$pkgconfig/bin:/bin:/usr/bin
 envpkgs="$glib $atk $pango"
 . $setenv

pkgs/gtk+/gtk+.fix

@@ -9,6 +9,7 @@ Package(
       , ("md5", "5a7c639f0f2d682bdc17e3f81c17c79c")
       ]))
 
+  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
   , ("pkgconfig", IncludeFix("pkgconfig/pkgconfig.fix"))
   , ("glib", IncludeFix("glib/glib.fix"))
   , ("atk", IncludeFix("atk/atk.fix"))

pkgs/gtkspell/gtkspell-build.sh

@@ -1,14 +1,16 @@
 #! /bin/sh
 
-export PATH=$pkgconfig/bin:/bin:/usr/bin
+. $stdenv/setup || exit 1
+
+export PATH=$pkgconfig/bin:$PATH
 envpkgs="$gtk $pspell"
-. $setenv
+. $setenv || exit 1
 
 export C_INCLUDE_PATH=$pspell/include:$C_INCLUDE_PATH
 
 tar xvfz $src || exit 1
 cd gtkspell-* || exit 1
-./configure --prefix=$out --disable-gtk-doc || exit 1
+LDFLAGS=-Wl,-S ./configure --prefix=$out --disable-gtk-doc || exit 1
 make || exit 1
 make install || exit 1
 echo $envpkgs > $out/envpkgs || exit 1

pkgs/gtkspell/gtkspell.fix

@@ -9,6 +9,7 @@ Package(
       , ("md5", "4ded985b8eefdf9ac6fbf79cad69ccbd")
       ]))
 
+  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
   , ("pkgconfig", IncludeFix("pkgconfig/pkgconfig.fix"))
   , ("gtk", IncludeFix("gtk+/gtk+.fix"))
   , ("pspell", IncludeFix("pspell/pspell.fix"))

pkgs/pan/pan-build.sh

@@ -1,14 +1,14 @@
 #! /bin/sh
 
-export PATH=$pkgconfig/bin:/bin:/usr/bin
-envpkgs="$gtk $gtkspell $gnet $libxml"
-. $setenv
+. $stdenv/setup || exit 1
 
-export LDFLAGS=-s
+export PATH=$pkgconfig/bin:$PATH
+envpkgs="$gtk $gtkspell $gnet $libxml"
+. $setenv || exit 1
 
 tar xvfj $src || exit 1
 cd pan-* || exit 1
-./configure --prefix=$out || exit 1
+LDFLAGS=-Wl,-S ./configure --prefix=$out || exit 1
 make || exit 1
 make install || exit 1
 echo $envpkgs > $out/envpkgs || exit 1

pkgs/pan/pan.fix

@@ -9,9 +9,10 @@ Package(
       , ("md5", "59612bf2551650c0060b214f9742a105")
       ]))
 
+  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
   , ("pkgconfig", IncludeFix("pkgconfig/pkgconfig.fix"))
   , ("gtk", IncludeFix("gtk+/gtk+.fix"))
-  , ("gtkspell", IncludeFix("gtkspell/gtkspell.fix"))
+
   , ("gnet", IncludeFix("gnet/gnet.fix"))
   , ("libxml", IncludeFix("libxml2/libxml2.fix"))
   ]

pkgs/pango/pango-build.sh

@@ -1,12 +1,14 @@
 #! /bin/sh
 
-export PATH=$pkgconfig/bin:/bin:/usr/bin
+. $stdenv/setup || exit 1
+
+export PATH=$pkgconfig/bin:$PATH
 envpkgs="$glib $Xft"
 . $setenv
 
 tar xvfj $src || exit 1
 cd pango-* || 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

pkgs/pango/pango.fix

@@ -9,6 +9,7 @@ Package(
       , ("md5", "12247592ea582907cfd2de81aeb32caf")
       ]))
 
+  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
   , ("pkgconfig", IncludeFix("pkgconfig/pkgconfig.fix"))
   , ("glib", IncludeFix("glib/glib.fix"))
   , ("Xft", IncludeFix("Xft/Xft.fix"))

pkgs/pkgconfig/pkgconfig-build.sh

@@ -1,10 +1,10 @@
 #! /bin/sh
 
-export PATH=/bin:/usr/bin
+. $stdenv/setup || exit 1
 
 tar xvfz $src || exit 1
 cd pkgconfig-* || exit 1
-./configure --prefix=$out || exit 1
+LDFLAGS=-Wl,-S ./configure --prefix=$out || exit 1
 make || exit 1
 mkdir $out || exit 1
 make install || exit 1

pkgs/pkgconfig/pkgconfig.fix

@@ -1,9 +1,12 @@
 Package(
   [ ("name", "pkgconfig-0.15.0")
   , ("build", Relative("pkgconfig/pkgconfig-build.sh"))
+
   , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
       [ ("url", "http://www.freedesktop.org/software/pkgconfig/releases/pkgconfig-0.15.0.tar.gz")
       , ("md5", "a7e4f60a6657dbc434334deb594cc242")
       ]))
+
+  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
   ]
 )

pkgs/pspell/pspell-build.sh

@@ -1,9 +1,9 @@
 #! /bin/sh
 
-export PATH=/bin:/usr/bin
+. $stdenv/setup || exit 1
 
 tar xvfz $src || exit 1
 cd pspell-* || exit 1
-./configure --prefix=$out || exit 1
+CXX=g++ LDFLAGS=-Wl,-S ./configure --prefix=$out || exit 1
 make || exit 1
 make install || exit 1

pkgs/pspell/pspell.fix

@@ -7,5 +7,7 @@ Package(
       [ ("url", "http://unc.dl.sourceforge.net/sourceforge/pspell/pspell-.12.2.tar.gz")
       , ("md5", "cfd3816b2372932a1b71c0ce4e9f881e")
       ]))
+
+  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
   ]
 )

pkgs/sylpheed/sylpheed-build.sh

@@ -1,16 +1,15 @@
 #! /bin/sh
 
-export PATH=/bin:/usr/bin
+. $stdenv/setup || exit 1
+
 envpkgs="$gtk $ssl"
-. $setenv
+. $setenv || exit 1
 
 export C_INCLUDE_PATH=$ssl/include:$C_INCLUDE_PATH
 
-export LDFLAGS=-s
-
 tar xvfj $src || exit 1
 cd sylpheed-* || exit 1
-./configure --prefix=$out --enable-ssl --disable-gdk-pixbuf --disable-imlibtest || exit 1
+LDFLAGS=-Wl,-S ./configure --prefix=$out --enable-ssl --disable-gdk-pixbuf --disable-imlibtest || exit 1
 make || exit 1
 make install || exit 1
 echo $envpkgs > $out/envpkgs || exit 1

pkgs/sylpheed/sylpheed.fix

@@ -9,6 +9,7 @@ Package(
       , ("md5", "6a1ae8e746099e13f8ba968d4604adcf")
       ]))
 
+  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
   , ("gtk", IncludeFix("gtk+-1/gtk+.fix"))
   , ("ssl", IncludeFix("openssl/openssl.fix"))
   ]

pkgs/system/system.fix

@@ -5,5 +5,8 @@ Package(
   , ("actSubversion", IncludeFix("subversion/subversion.fix"))
   , ("actStrategoXT", IncludeFix("strategoxt/strategoxt.fix"))
   , ("actATerm", IncludeFix("aterm/aterm.fix"))
+  , ("actPan", IncludeFix("pan/pan.fix"))
+  , ("actMPlayer", IncludeFix("MPlayer/MPlayer.fix"))
+  , ("actSylpheed", IncludeFix("sylpheed/sylpheed.fix"))
   ]
 )