diff --git a/pkgs/MPlayer/MPlayer-build.sh b/pkgs/MPlayer/MPlayer-build.sh index 00dd0e82960..eb9eea7f333 100644 --- a/pkgs/MPlayer/MPlayer-build.sh +++ b/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 diff --git a/pkgs/MPlayer/MPlayer.fix b/pkgs/MPlayer/MPlayer.fix index 0ea1ccd4420..9f75c8c74c9 100644 --- a/pkgs/MPlayer/MPlayer.fix +++ b/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")) ] diff --git a/pkgs/Xft/Xft-build.sh b/pkgs/Xft/Xft-build.sh index 501f07a5d9b..a0adb1cf330 100755 --- a/pkgs/Xft/Xft-build.sh +++ b/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 diff --git a/pkgs/Xft/Xft.fix b/pkgs/Xft/Xft.fix index f59ed4b01cf..ce42676c949 100644 --- a/pkgs/Xft/Xft.fix +++ b/pkgs/Xft/Xft.fix @@ -9,6 +9,7 @@ Package( , ("md5", "2f2852c80924a9b5356c3037a471c1a1") ])) + , ("stdenv", IncludeFix("stdenv/stdenv.fix")) , ("fontconfig", IncludeFix("fontconfig/fontconfig.fix")) ] ) diff --git a/pkgs/atk/atk-build.sh b/pkgs/atk/atk-build.sh index 5991bd04720..67f87930c43 100755 --- a/pkgs/atk/atk-build.sh +++ b/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 diff --git a/pkgs/atk/atk.fix b/pkgs/atk/atk.fix index c8ce208d4cf..8046bdf018a 100644 --- a/pkgs/atk/atk.fix +++ b/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")) ] diff --git a/pkgs/fontconfig/fontconfig-build.sh b/pkgs/fontconfig/fontconfig-build.sh index 6584f1f19f4..e4b6f563d21 100755 --- a/pkgs/fontconfig/fontconfig-build.sh +++ b/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 diff --git a/pkgs/fontconfig/fontconfig.fix b/pkgs/fontconfig/fontconfig.fix index 41e8f4b6970..07c00f1a193 100644 --- a/pkgs/fontconfig/fontconfig.fix +++ b/pkgs/fontconfig/fontconfig.fix @@ -9,6 +9,7 @@ Package( , ("md5", "2f2852c80924a9b5356c3037a471c1a1") ])) + , ("stdenv", IncludeFix("stdenv/stdenv.fix")) , ("freetype", IncludeFix("freetype/freetype.fix")) ] ) diff --git a/pkgs/freetype/freetype-build.sh b/pkgs/freetype/freetype-build.sh index 96629602570..7c27e7ff373 100755 --- a/pkgs/freetype/freetype-build.sh +++ b/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 diff --git a/pkgs/freetype/freetype.fix b/pkgs/freetype/freetype.fix index 39aba3af69f..a785fb69295 100644 --- a/pkgs/freetype/freetype.fix +++ b/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")) ] ) diff --git a/pkgs/glib-1/glib-build.sh b/pkgs/glib-1/glib-build.sh index 24d5b441261..174ae5b2e1e 100755 --- a/pkgs/glib-1/glib-build.sh +++ b/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 diff --git a/pkgs/glib-1/glib.fix b/pkgs/glib-1/glib.fix index 269618a08da..9117321a88d 100644 --- a/pkgs/glib-1/glib.fix +++ b/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")) ] ) diff --git a/pkgs/glib/glib-build.sh b/pkgs/glib/glib-build.sh index 3ec77b96d8e..946bab455f3 100755 --- a/pkgs/glib/glib-build.sh +++ b/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 diff --git a/pkgs/glib/glib.fix b/pkgs/glib/glib.fix index d622ead6e96..9af1337312c 100644 --- a/pkgs/glib/glib.fix +++ b/pkgs/glib/glib.fix @@ -8,6 +8,7 @@ Package( , ("md5", "3e9a9512943c81a78cafa0536dcc8b41") ])) + , ("stdenv", IncludeFix("stdenv/stdenv.fix")) , ("pkgconfig", IncludeFix("pkgconfig/pkgconfig.fix")) ] ) diff --git a/pkgs/gnet/gnet-build.sh b/pkgs/gnet/gnet-build.sh index e29ac89f103..c57703ea77a 100755 --- a/pkgs/gnet/gnet-build.sh +++ b/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 diff --git a/pkgs/gnet/gnet.fix b/pkgs/gnet/gnet.fix index 79c2de56a32..3d31e567327 100644 --- a/pkgs/gnet/gnet.fix +++ b/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")) ] diff --git a/pkgs/gtk+-1/gtk+-build.sh b/pkgs/gtk+-1/gtk+-build.sh index a18809291d2..78600240837 100755 --- a/pkgs/gtk+-1/gtk+-build.sh +++ b/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 diff --git a/pkgs/gtk+-1/gtk+.fix b/pkgs/gtk+-1/gtk+.fix index b62765f67cc..24e2c793574 100644 --- a/pkgs/gtk+-1/gtk+.fix +++ b/pkgs/gtk+-1/gtk+.fix @@ -9,6 +9,7 @@ Package( , ("md5", "4d5cb2fc7fb7830e4af9747a36bfce20") ])) + , ("stdenv", IncludeFix("stdenv/stdenv.fix")) , ("glib", IncludeFix("glib-1/glib.fix")) ] ) diff --git a/pkgs/gtk+/gtk+-build.sh b/pkgs/gtk+/gtk+-build.sh index d60f73d83f3..db42040f0f1 100755 --- a/pkgs/gtk+/gtk+-build.sh +++ b/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 diff --git a/pkgs/gtk+/gtk+.fix b/pkgs/gtk+/gtk+.fix index 173b17ae5e0..92cb60f0231 100644 --- a/pkgs/gtk+/gtk+.fix +++ b/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")) diff --git a/pkgs/gtkspell/gtkspell-build.sh b/pkgs/gtkspell/gtkspell-build.sh index 15f5e43553a..452e179ad71 100755 --- a/pkgs/gtkspell/gtkspell-build.sh +++ b/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 diff --git a/pkgs/gtkspell/gtkspell.fix b/pkgs/gtkspell/gtkspell.fix index b1438b1c765..67ee6847e8a 100644 --- a/pkgs/gtkspell/gtkspell.fix +++ b/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")) diff --git a/pkgs/pan/pan-build.sh b/pkgs/pan/pan-build.sh index 495747fdcb9..2b3393e0cd6 100755 --- a/pkgs/pan/pan-build.sh +++ b/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 diff --git a/pkgs/pan/pan.fix b/pkgs/pan/pan.fix index 8579107a756..60b47453875 100644 --- a/pkgs/pan/pan.fix +++ b/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")) ] diff --git a/pkgs/pango/pango-build.sh b/pkgs/pango/pango-build.sh index 9d9dd887807..40c7f71e459 100755 --- a/pkgs/pango/pango-build.sh +++ b/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 diff --git a/pkgs/pango/pango.fix b/pkgs/pango/pango.fix index b212ea8c39e..dbd49d617ba 100644 --- a/pkgs/pango/pango.fix +++ b/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")) diff --git a/pkgs/pkgconfig/pkgconfig-build.sh b/pkgs/pkgconfig/pkgconfig-build.sh index 29dc8fcf46a..0d1b7c65ae7 100755 --- a/pkgs/pkgconfig/pkgconfig-build.sh +++ b/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 diff --git a/pkgs/pkgconfig/pkgconfig.fix b/pkgs/pkgconfig/pkgconfig.fix index e98280bb3c2..f9dfdd984a8 100644 --- a/pkgs/pkgconfig/pkgconfig.fix +++ b/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")) ] ) diff --git a/pkgs/pspell/pspell-build.sh b/pkgs/pspell/pspell-build.sh index 5916ca2f714..8183ea52575 100755 --- a/pkgs/pspell/pspell-build.sh +++ b/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 diff --git a/pkgs/pspell/pspell.fix b/pkgs/pspell/pspell.fix index 2d092091e30..15966349364 100644 --- a/pkgs/pspell/pspell.fix +++ b/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")) ] ) diff --git a/pkgs/sylpheed/sylpheed-build.sh b/pkgs/sylpheed/sylpheed-build.sh index e97592f4c14..95c49c648fe 100755 --- a/pkgs/sylpheed/sylpheed-build.sh +++ b/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 diff --git a/pkgs/sylpheed/sylpheed.fix b/pkgs/sylpheed/sylpheed.fix index 50d3100ad4d..dd552e1175a 100644 --- a/pkgs/sylpheed/sylpheed.fix +++ b/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")) ] diff --git a/pkgs/system/system.fix b/pkgs/system/system.fix index 3fd51b9b7ac..2ec54ffe3fb 100644 --- a/pkgs/system/system.fix +++ b/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")) ] )