From 23154d034f84349cebf98aebe431a041f09bbe59 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 18 Aug 2003 19:52:54 +0000 Subject: [PATCH] * Get rid of all `-S' flags (to remove debug info); this is now the default. * Remove all references to set-env.sh; it has been merged into stdenv.fix (actually baseenv.fix). svn path=/nixpkgs/trunk/; revision=316 --- pkgs/MPlayer/MPlayer-build.sh | 6 +----- pkgs/MPlayer/MPlayer.fix | 1 - pkgs/Xft/Xft-build.sh | 6 ++---- pkgs/Xft/Xft.fix | 1 - pkgs/aterm/aterm-build.sh | 2 -- pkgs/atk/atk-build.sh | 8 ++------ pkgs/atk/atk.fix | 1 - pkgs/autoxt/autoxt-build.sh | 2 -- pkgs/db4/db4-build.sh | 2 -- pkgs/expat/expat-build.sh | 2 -- pkgs/firebird/firebird-build.sh | 8 ++------ pkgs/firebird/firebird.fix | 1 - pkgs/fontconfig/fontconfig-build.sh | 6 +----- pkgs/fontconfig/fontconfig.fix | 1 - pkgs/freetype/freetype-build.sh | 2 -- pkgs/glib-1/glib-build.sh | 2 -- pkgs/glib/glib-build.sh | 3 --- pkgs/gnet/gnet-build.sh | 6 +----- pkgs/gnet/gnet.fix | 1 - pkgs/gtk+-1/gtk+-build.sh | 6 +----- pkgs/gtk+-1/gtk+.fix | 1 - pkgs/gtk+/gtk+-build.sh | 8 ++------ pkgs/gtk+/gtk+.fix | 1 - pkgs/gtkspell/gtkspell-build.sh | 8 ++------ pkgs/gtkspell/gtkspell.fix | 1 - pkgs/httpd/httpd-build.sh | 6 +----- pkgs/httpd/httpd.fix | 1 - pkgs/libIDL/libIDL-build.sh | 8 ++------ pkgs/libIDL/libIDL.fix | 1 - pkgs/libxml2/libxml2-build.sh | 2 -- pkgs/libxslt/libxslt-build.sh | 6 +----- pkgs/libxslt/libxslt.fix | 1 - pkgs/openssl/openssl-build.sh | 5 ----- pkgs/openssl/openssl.fix | 1 - pkgs/pan/pan-build.sh | 8 ++------ pkgs/pan/pan.fix | 1 - pkgs/pango/pango-build.sh | 8 ++------ pkgs/pango/pango.fix | 1 - pkgs/pkgconfig/pkgconfig-build.sh | 2 +- pkgs/pspell/pspell-build.sh | 2 -- pkgs/sdf2/sdf2-build.sh | 2 -- pkgs/srts/srts-build.sh | 2 -- pkgs/strategoxt-0.9.2/strategoxt-build.sh | 2 -- pkgs/subversion/subversion-build.sh | 6 +----- pkgs/subversion/subversion.fix | 3 +-- pkgs/swig/swig-build.sh | 2 -- pkgs/sylpheed/sylpheed-build.sh | 6 ++---- pkgs/sylpheed/sylpheed.fix | 1 - pkgs/wxPython/wxPython.fix | 1 - pkgs/xtc/xtc-build.sh | 2 -- 50 files changed, 27 insertions(+), 139 deletions(-) diff --git a/pkgs/MPlayer/MPlayer-build.sh b/pkgs/MPlayer/MPlayer-build.sh index cdac34bb45c..7c03c29620b 100755 --- a/pkgs/MPlayer/MPlayer-build.sh +++ b/pkgs/MPlayer/MPlayer-build.sh @@ -1,11 +1,7 @@ #! /bin/sh -export NIX_LDFLAGS=-Wl,-s - -. $stdenv/setup || exit 1 - envpkgs="$freetype" -. $setenv || exit 1 +. $stdenv/setup || exit 1 tar xvfj $src || exit 1 tar xvfj $fonts || exit 1 diff --git a/pkgs/MPlayer/MPlayer.fix b/pkgs/MPlayer/MPlayer.fix index 9f75c8c74c9..2dd109ec4a4 100644 --- a/pkgs/MPlayer/MPlayer.fix +++ b/pkgs/MPlayer/MPlayer.fix @@ -2,7 +2,6 @@ Package( [ ("name", "MPlayer-0.90") , ("build", Relative("MPlayer/MPlayer-build.sh")) - , ("setenv", Relative("helpers/set-env.sh")) , ("src", App(IncludeFix("fetchurl/fetchurl.fix"), [ ("url", "http://www2.mplayerhq.hu/MPlayer/releases/MPlayer-0.90.tar.bz2") diff --git a/pkgs/Xft/Xft-build.sh b/pkgs/Xft/Xft-build.sh index a0adb1cf330..591d1d9762a 100755 --- a/pkgs/Xft/Xft-build.sh +++ b/pkgs/Xft/Xft-build.sh @@ -1,13 +1,11 @@ #! /bin/sh +envpkgs="$fontconfig" . $stdenv/setup || exit 1 -envpkgs=$fontconfig -. $setenv - tar xvfz $src || exit 1 cd fcpackage*/Xft || exit 1 -LDFLAGS=-Wl,-S ./configure --prefix=$out --x-includes=/usr/X11/include --x-libraries=/usr/X11/lib || exit 1 +./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 ce42676c949..a3186ba8d52 100644 --- a/pkgs/Xft/Xft.fix +++ b/pkgs/Xft/Xft.fix @@ -2,7 +2,6 @@ Package( [ ("name", "Xft-20021121") , ("build", Relative("Xft/Xft-build.sh")) - , ("setenv", Relative("helpers/set-env.sh")) , ("src", App(IncludeFix("fetchurl/fetchurl.fix"), [ ("url", "http://fontconfig.org/release/fcpackage.2_1.tar.gz") diff --git a/pkgs/aterm/aterm-build.sh b/pkgs/aterm/aterm-build.sh index 22e1c8d2999..5915dc0f87d 100755 --- a/pkgs/aterm/aterm-build.sh +++ b/pkgs/aterm/aterm-build.sh @@ -1,7 +1,5 @@ #! /bin/sh -export NIX_LDFLAGS=-Wl,-s - . $stdenv/setup || exit 1 tar xvfz $src || exit 1 diff --git a/pkgs/atk/atk-build.sh b/pkgs/atk/atk-build.sh index 0bb71d047a2..4092fe4e1b9 100755 --- a/pkgs/atk/atk-build.sh +++ b/pkgs/atk/atk-build.sh @@ -1,12 +1,8 @@ #! /bin/sh -export NIX_LDFLAGS=-Wl,-s - -. $stdenv/setup || exit 1 - -export PATH=$pkgconfig/bin:$PATH envpkgs=$glib -. $setenv || exit 1 +. $stdenv/setup || exit 1 +export PATH=$pkgconfig/bin:$PATH tar xvfj $src || exit 1 cd atk-* || exit 1 diff --git a/pkgs/atk/atk.fix b/pkgs/atk/atk.fix index 8046bdf018a..8113d81bd38 100644 --- a/pkgs/atk/atk.fix +++ b/pkgs/atk/atk.fix @@ -2,7 +2,6 @@ Package( [ ("name", "atk-1.2.4") , ("build", Relative("atk/atk-build.sh")) - , ("setenv", Relative("helpers/set-env.sh")) , ("src", App(IncludeFix("fetchurl/fetchurl.fix"), [ ("url", "ftp://ftp.gtk.org/pub/gtk/v2.2/atk-1.2.4.tar.bz2") diff --git a/pkgs/autoxt/autoxt-build.sh b/pkgs/autoxt/autoxt-build.sh index ca959b95703..609f0d16644 100755 --- a/pkgs/autoxt/autoxt-build.sh +++ b/pkgs/autoxt/autoxt-build.sh @@ -1,7 +1,5 @@ #! /bin/sh -export NIX_LDFLAGS=-Wl,-s - . $stdenv/setup || exit 1 echo "out: $out" diff --git a/pkgs/db4/db4-build.sh b/pkgs/db4/db4-build.sh index 57d12f3e485..f32e4ec50dd 100755 --- a/pkgs/db4/db4-build.sh +++ b/pkgs/db4/db4-build.sh @@ -1,7 +1,5 @@ #! /bin/sh -export NIX_LDFLAGS=-Wl,-s - . $stdenv/setup || exit 1 tar xvfz $src || exit 1 diff --git a/pkgs/expat/expat-build.sh b/pkgs/expat/expat-build.sh index 61286cc4a5a..c5ca8edfb92 100755 --- a/pkgs/expat/expat-build.sh +++ b/pkgs/expat/expat-build.sh @@ -1,7 +1,5 @@ #! /bin/sh -export NIX_LDFLAGS=-Wl,-s - . $stdenv/setup || exit 1 tar xvfz $src || exit 1 diff --git a/pkgs/firebird/firebird-build.sh b/pkgs/firebird/firebird-build.sh index 29241e0894f..90f85c68b9c 100755 --- a/pkgs/firebird/firebird-build.sh +++ b/pkgs/firebird/firebird-build.sh @@ -1,12 +1,8 @@ #! /bin/sh -export NIX_LDFLAGS=-Wl,-s - -. $stdenv/setup || exit 1 - -export PATH=$pkgconfig/bin:$PATH envpkgs="$gtk $libIDL" -. $setenv || exit 1 +. $stdenv/setup || exit 1 +export PATH=$pkgconfig/bin:$PATH tar xvfj $src || exit 1 cd mozilla || exit 1 diff --git a/pkgs/firebird/firebird.fix b/pkgs/firebird/firebird.fix index 0dc503ad6ac..5965447db86 100644 --- a/pkgs/firebird/firebird.fix +++ b/pkgs/firebird/firebird.fix @@ -2,7 +2,6 @@ Package( [ ("name", "firebird-0.6.1") , ("build", Relative("firebird/firebird-build.sh")) - , ("setenv", Relative("helpers/set-env.sh")) , ("src", App(IncludeFix("fetchurl/fetchurl.fix"), [ ("url", "http://ftp.mozilla.org/pub/firebird/releases/0.6.1/MozillaFirebird-source-0.6.1.tar.bz2") diff --git a/pkgs/fontconfig/fontconfig-build.sh b/pkgs/fontconfig/fontconfig-build.sh index 04d3ba388ee..ec313d835e1 100755 --- a/pkgs/fontconfig/fontconfig-build.sh +++ b/pkgs/fontconfig/fontconfig-build.sh @@ -1,11 +1,7 @@ #! /bin/sh -export NIX_LDFLAGS=-Wl,-s - -. $stdenv/setup || exit 1 - envpkgs="$freetype $expat" -. $setenv || exit 1 +. $stdenv/setup || exit 1 tar xvfz $src || exit 1 cd fcpackage*/fontconfig || exit 1 diff --git a/pkgs/fontconfig/fontconfig.fix b/pkgs/fontconfig/fontconfig.fix index e953222c0ce..e02537c3511 100644 --- a/pkgs/fontconfig/fontconfig.fix +++ b/pkgs/fontconfig/fontconfig.fix @@ -2,7 +2,6 @@ Package( [ ("name", "fontconfig-20021121") , ("build", Relative("fontconfig/fontconfig-build.sh")) - , ("setenv", Relative("helpers/set-env.sh")) , ("src", App(IncludeFix("fetchurl/fetchurl.fix"), [ ("url", "http://fontconfig.org/release/fcpackage.2_1.tar.gz") diff --git a/pkgs/freetype/freetype-build.sh b/pkgs/freetype/freetype-build.sh index 07b087ff1fe..81bd27e4882 100755 --- a/pkgs/freetype/freetype-build.sh +++ b/pkgs/freetype/freetype-build.sh @@ -1,7 +1,5 @@ #! /bin/sh -export NIX_LDFLAGS=-Wl,-s - . $stdenv/setup || exit 1 tar xvfj $src || exit 1 diff --git a/pkgs/glib-1/glib-build.sh b/pkgs/glib-1/glib-build.sh index d32fa470420..e6f721de3f4 100755 --- a/pkgs/glib-1/glib-build.sh +++ b/pkgs/glib-1/glib-build.sh @@ -1,7 +1,5 @@ #! /bin/sh -export NIX_LDFLAGS=-Wl,-s - . $stdenv/setup || exit 1 tar xvfz $src || exit 1 diff --git a/pkgs/glib/glib-build.sh b/pkgs/glib/glib-build.sh index f6966d41a98..1da5fb30238 100755 --- a/pkgs/glib/glib-build.sh +++ b/pkgs/glib/glib-build.sh @@ -1,9 +1,6 @@ #! /bin/sh -export NIX_LDFLAGS=-Wl,-s - . $stdenv/setup || exit 1 - export PATH=$pkgconfig/bin:$PATH tar xvfj $src || exit 1 diff --git a/pkgs/gnet/gnet-build.sh b/pkgs/gnet/gnet-build.sh index b89a492480d..c5e845d1fef 100755 --- a/pkgs/gnet/gnet-build.sh +++ b/pkgs/gnet/gnet-build.sh @@ -1,12 +1,8 @@ #! /bin/sh -export NIX_LDFLAGS=-Wl,-s - +envpkgs="$glib" . $stdenv/setup || exit 1 - export PATH=$pkgconfig/bin:/bin:/usr/bin -envpkgs=$glib -. $setenv || exit 1 tar xvfz $src || exit 1 cd gnet-* || exit 1 diff --git a/pkgs/gnet/gnet.fix b/pkgs/gnet/gnet.fix index 3d31e567327..38ecfad90ad 100644 --- a/pkgs/gnet/gnet.fix +++ b/pkgs/gnet/gnet.fix @@ -2,7 +2,6 @@ Package( [ ("name", "gnet-1.1.9") , ("build", Relative("gnet/gnet-build.sh")) - , ("setenv", Relative("helpers/set-env.sh")) , ("src", App(IncludeFix("fetchurl/fetchurl.fix"), [ ("url", "http://www.gnetlibrary.org/src/gnet-1.1.9.tar.gz") diff --git a/pkgs/gtk+-1/gtk+-build.sh b/pkgs/gtk+-1/gtk+-build.sh index 16553ff2174..e409149fd4b 100755 --- a/pkgs/gtk+-1/gtk+-build.sh +++ b/pkgs/gtk+-1/gtk+-build.sh @@ -1,11 +1,7 @@ #! /bin/sh -export NIX_LDFLAGS=-Wl,-s - -. $stdenv/setup || exit 1 - envpkgs="$glib" -. $setenv || exit 1 +. $stdenv/setup || 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 24e2c793574..99f9cc5c31f 100644 --- a/pkgs/gtk+-1/gtk+.fix +++ b/pkgs/gtk+-1/gtk+.fix @@ -2,7 +2,6 @@ Package( [ ("name", "gtk+-1.2.10") , ("build", Relative("gtk+-1/gtk+-build.sh")) - , ("setenv", Relative("helpers/set-env.sh")) , ("src", App(IncludeFix("fetchurl/fetchurl.fix"), [ ("url", "ftp://ftp.gtk.org/pub/gtk/v1.2/gtk+-1.2.10.tar.gz") diff --git a/pkgs/gtk+/gtk+-build.sh b/pkgs/gtk+/gtk+-build.sh index bb6df1c3a1e..590e68e2e9a 100755 --- a/pkgs/gtk+/gtk+-build.sh +++ b/pkgs/gtk+/gtk+-build.sh @@ -1,12 +1,8 @@ #! /bin/sh -export NIX_LDFLAGS=-Wl,-s - -. $stdenv/setup || exit 1 - -export PATH=$pkgconfig/bin:$PATH envpkgs="$glib $atk $pango" -. $setenv || exit 1 +. $stdenv/setup || exit 1 +export PATH=$pkgconfig/bin:$PATH tar xvfj $src || exit 1 cd gtk+-* || exit 1 diff --git a/pkgs/gtk+/gtk+.fix b/pkgs/gtk+/gtk+.fix index 92cb60f0231..d64af28ef17 100644 --- a/pkgs/gtk+/gtk+.fix +++ b/pkgs/gtk+/gtk+.fix @@ -2,7 +2,6 @@ Package( [ ("name", "gtk+-2.2.2") , ("build", Relative("gtk+/gtk+-build.sh")) - , ("setenv", Relative("helpers/set-env.sh")) , ("src", App(IncludeFix("fetchurl/fetchurl.fix"), [ ("url", "ftp://ftp.gtk.org/pub/gtk/v2.2/gtk+-2.2.2.tar.bz2") diff --git a/pkgs/gtkspell/gtkspell-build.sh b/pkgs/gtkspell/gtkspell-build.sh index ed442b652dc..52bf7db5204 100755 --- a/pkgs/gtkspell/gtkspell-build.sh +++ b/pkgs/gtkspell/gtkspell-build.sh @@ -1,12 +1,8 @@ #! /bin/sh -export NIX_LDFLAGS=-Wl,-s - -. $stdenv/setup || exit 1 - -export PATH=$pkgconfig/bin:$PATH envpkgs="$gtk $pspell" -. $setenv || exit 1 +. $stdenv/setup || exit 1 +export PATH=$pkgconfig/bin:$PATH export C_INCLUDE_PATH=$pspell/include:$C_INCLUDE_PATH diff --git a/pkgs/gtkspell/gtkspell.fix b/pkgs/gtkspell/gtkspell.fix index 67ee6847e8a..a8bbde45366 100644 --- a/pkgs/gtkspell/gtkspell.fix +++ b/pkgs/gtkspell/gtkspell.fix @@ -2,7 +2,6 @@ Package( [ ("name", "gtkspell-2.0.4") , ("build", Relative("gtkspell/gtkspell-build.sh")) - , ("setenv", Relative("helpers/set-env.sh")) , ("src", App(IncludeFix("fetchurl/fetchurl.fix"), [ ("url", "http://gtkspell.sourceforge.net/download/gtkspell-2.0.4.tar.gz") diff --git a/pkgs/httpd/httpd-build.sh b/pkgs/httpd/httpd-build.sh index c6dc07acf83..f5809e7d947 100755 --- a/pkgs/httpd/httpd-build.sh +++ b/pkgs/httpd/httpd-build.sh @@ -1,11 +1,7 @@ #! /bin/sh -export NIX_LDFLAGS=-Wl,-s - -. $stdenv/setup || exit 1 - envpkgs="$ssl $db4 $expat" -. $setenv || exit 1 +. $stdenv/setup || exit 1 tar xvfz $src || exit 1 cd httpd-* || exit 1 diff --git a/pkgs/httpd/httpd.fix b/pkgs/httpd/httpd.fix index d13baaeed1e..8d6b35f036b 100644 --- a/pkgs/httpd/httpd.fix +++ b/pkgs/httpd/httpd.fix @@ -2,7 +2,6 @@ Package( [ ("name", "httpd-2.0.47") , ("build", Relative("httpd/httpd-build.sh")) - , ("setenv", Relative("helpers/set-env.sh")) , ("src", App(IncludeFix("fetchurl/fetchurl.fix"), [ ("url", "http://apache.cs.uu.nl/dist/httpd/httpd-2.0.47.tar.gz") diff --git a/pkgs/libIDL/libIDL-build.sh b/pkgs/libIDL/libIDL-build.sh index c59c5ae8e48..35ee5adcf08 100755 --- a/pkgs/libIDL/libIDL-build.sh +++ b/pkgs/libIDL/libIDL-build.sh @@ -1,12 +1,8 @@ #! /bin/sh -export NIX_LDFLAGS=-Wl,-s - -. $stdenv/setup || exit 1 - -export PATH=$pkgconfig/bin:$PATH envpkgs="$glib" -. $setenv || exit 1 +. $stdenv/setup || exit 1 +export PATH=$pkgconfig/bin:$PATH tar xvfj $src || exit 1 cd libIDL-* || exit 1 diff --git a/pkgs/libIDL/libIDL.fix b/pkgs/libIDL/libIDL.fix index 78e4e0707de..a6b3b1303aa 100644 --- a/pkgs/libIDL/libIDL.fix +++ b/pkgs/libIDL/libIDL.fix @@ -2,7 +2,6 @@ Package( [ ("name", "libIDL-0.8.2") , ("build", Relative("libIDL/libIDL-build.sh")) - , ("setenv", Relative("helpers/set-env.sh")) , ("src", App(IncludeFix("fetchurl/fetchurl.fix"), [ ("url", "ftp://ftp.gnome.org/pub/gnome/sources/libIDL/0.8/libIDL-0.8.2.tar.bz2") diff --git a/pkgs/libxml2/libxml2-build.sh b/pkgs/libxml2/libxml2-build.sh index f691e1d5702..8953ca5b80a 100755 --- a/pkgs/libxml2/libxml2-build.sh +++ b/pkgs/libxml2/libxml2-build.sh @@ -1,7 +1,5 @@ #! /bin/sh -export NIX_LDFLAGS=-Wl,-s - . $stdenv/setup || exit 1 tar xvfz $src || exit 1 diff --git a/pkgs/libxslt/libxslt-build.sh b/pkgs/libxslt/libxslt-build.sh index 3b52df125f8..1dee15e2579 100755 --- a/pkgs/libxslt/libxslt-build.sh +++ b/pkgs/libxslt/libxslt-build.sh @@ -1,11 +1,7 @@ #! /bin/sh -export NIX_LDFLAGS=-Wl,-s - -. $stdenv/setup || exit 1 - envpkgs="$libxml" -. $setenv || exit 1 +. $stdenv/setup || exit 1 tar xvfz $src || exit 1 cd libxslt-* || exit 1 diff --git a/pkgs/libxslt/libxslt.fix b/pkgs/libxslt/libxslt.fix index c630633bb38..8d767fd0a7c 100644 --- a/pkgs/libxslt/libxslt.fix +++ b/pkgs/libxslt/libxslt.fix @@ -2,7 +2,6 @@ Package( [ ("name", "libxslt-1.0.31") , ("build", Relative("libxslt/libxslt-build.sh")) - , ("setenv", Relative("helpers/set-env.sh")) , ("src", App(IncludeFix("fetchurl/fetchurl.fix"), [ ("url", "ftp://xmlsoft.org/libxslt-1.0.31.tar.gz") diff --git a/pkgs/openssl/openssl-build.sh b/pkgs/openssl/openssl-build.sh index 1e6213ae648..e5c7c2e13ed 100755 --- a/pkgs/openssl/openssl-build.sh +++ b/pkgs/openssl/openssl-build.sh @@ -1,12 +1,7 @@ #! /bin/sh -export NIX_LDFLAGS=-Wl,-s - . $stdenv/setup || exit 1 -envpkgs="" -. $setenv || exit 1 - tar xvfz $src || exit 1 cd openssl-* || exit 1 ./config --prefix=$out shared || exit 1 diff --git a/pkgs/openssl/openssl.fix b/pkgs/openssl/openssl.fix index 533f6d7fb4b..14b9e9f34d8 100644 --- a/pkgs/openssl/openssl.fix +++ b/pkgs/openssl/openssl.fix @@ -2,7 +2,6 @@ Package( [ ("name", "openssl-0.9.7b") , ("build", Relative("openssl/openssl-build.sh")) - , ("setenv", Relative("helpers/set-env.sh")) , ("src", App(IncludeFix("fetchurl/fetchurl.fix"), [ ("url", "http://www.openssl.org/source/openssl-0.9.7b.tar.gz") diff --git a/pkgs/pan/pan-build.sh b/pkgs/pan/pan-build.sh index efe51857f66..9d095a8a2b6 100755 --- a/pkgs/pan/pan-build.sh +++ b/pkgs/pan/pan-build.sh @@ -1,12 +1,8 @@ #! /bin/sh -export NIX_LDFLAGS=-Wl,-s - -. $stdenv/setup || exit 1 - -export PATH=$pkgconfig/bin:$PATH envpkgs="$gtk $gtkspell $gnet $libxml" -. $setenv || exit 1 +. $stdenv/setup || exit 1 +export PATH=$pkgconfig/bin:$PATH tar xvfj $src || exit 1 cd pan-* || exit 1 diff --git a/pkgs/pan/pan.fix b/pkgs/pan/pan.fix index be3c8066ca0..3759ef938f0 100644 --- a/pkgs/pan/pan.fix +++ b/pkgs/pan/pan.fix @@ -2,7 +2,6 @@ Package( [ ("name", "pan-0.14.0.90") , ("build", Relative("pan/pan-build.sh")) - , ("setenv", Relative("helpers/set-env.sh")) , ("src", App(IncludeFix("fetchurl/fetchurl.fix"), [ ("url", "http://losser.st-lab.cs.uu.nl/~eelco/mirror/pan-0.14.0.90.tar.bz2") diff --git a/pkgs/pango/pango-build.sh b/pkgs/pango/pango-build.sh index 855bf27396b..0b63ccce4ce 100755 --- a/pkgs/pango/pango-build.sh +++ b/pkgs/pango/pango-build.sh @@ -1,12 +1,8 @@ #! /bin/sh -export NIX_LDFLAGS=-Wl,-s - -. $stdenv/setup || exit 1 - -export PATH=$pkgconfig/bin:$PATH envpkgs="$glib $Xft" -. $setenv || exit 1 +. $stdenv/setup || exit 1 +export PATH=$pkgconfig/bin:$PATH tar xvfj $src || exit 1 cd pango-* || exit 1 diff --git a/pkgs/pango/pango.fix b/pkgs/pango/pango.fix index dbd49d617ba..7efde701b8a 100644 --- a/pkgs/pango/pango.fix +++ b/pkgs/pango/pango.fix @@ -2,7 +2,6 @@ Package( [ ("name", "pango-1.2.3") , ("build", Relative("pango/pango-build.sh")) - , ("setenv", Relative("helpers/set-env.sh")) , ("src", App(IncludeFix("fetchurl/fetchurl.fix"), [ ("url", "ftp://ftp.gtk.org/pub/gtk/v2.2/pango-1.2.3.tar.bz2") diff --git a/pkgs/pkgconfig/pkgconfig-build.sh b/pkgs/pkgconfig/pkgconfig-build.sh index 0d1b7c65ae7..5ec940cb03a 100755 --- a/pkgs/pkgconfig/pkgconfig-build.sh +++ b/pkgs/pkgconfig/pkgconfig-build.sh @@ -4,7 +4,7 @@ tar xvfz $src || exit 1 cd pkgconfig-* || exit 1 -LDFLAGS=-Wl,-S ./configure --prefix=$out || exit 1 +./configure --prefix=$out || exit 1 make || exit 1 mkdir $out || exit 1 make install || exit 1 diff --git a/pkgs/pspell/pspell-build.sh b/pkgs/pspell/pspell-build.sh index 6d5675110ac..eb1a7e9484e 100755 --- a/pkgs/pspell/pspell-build.sh +++ b/pkgs/pspell/pspell-build.sh @@ -1,7 +1,5 @@ #! /bin/sh -export NIX_LDFLAGS=-Wl,-s - . $stdenv/setup || exit 1 tar xvfz $src || exit 1 diff --git a/pkgs/sdf2/sdf2-build.sh b/pkgs/sdf2/sdf2-build.sh index 9639bdfef2c..f9a69962d52 100755 --- a/pkgs/sdf2/sdf2-build.sh +++ b/pkgs/sdf2/sdf2-build.sh @@ -1,7 +1,5 @@ #! /bin/sh -export NIX_LDFLAGS=-Wl,-s - . $stdenv/setup || exit 1 tar xvfz $src || exit 1 diff --git a/pkgs/srts/srts-build.sh b/pkgs/srts/srts-build.sh index fdb3f41b15d..784cf555f6b 100755 --- a/pkgs/srts/srts-build.sh +++ b/pkgs/srts/srts-build.sh @@ -2,8 +2,6 @@ set -e -export NIX_LDFLAGS=-Wl,-s - . $stdenv/setup export PATH=$autoxt/bin:$PATH diff --git a/pkgs/strategoxt-0.9.2/strategoxt-build.sh b/pkgs/strategoxt-0.9.2/strategoxt-build.sh index 585d2d011f8..bf538794902 100755 --- a/pkgs/strategoxt-0.9.2/strategoxt-build.sh +++ b/pkgs/strategoxt-0.9.2/strategoxt-build.sh @@ -1,7 +1,5 @@ #! /bin/sh -export NIX_LDFLAGS=-Wl,-s - . $stdenv/setup || exit 1 tar xvfz $src || exit 1 diff --git a/pkgs/subversion/subversion-build.sh b/pkgs/subversion/subversion-build.sh index fa2de05e5a2..69862316ae3 100755 --- a/pkgs/subversion/subversion-build.sh +++ b/pkgs/subversion/subversion-build.sh @@ -1,11 +1,7 @@ #! /bin/sh -export NIX_LDFLAGS=-Wl,-s - -. $stdenv/setup || exit 1 - envpkgs="$ssl $db4 $httpd $swig $libxml" -. $setenv || exit 1 +. $stdenv/setup || exit 1 if test $localServer; then extraflags="--with-berkeley-db=$db4 $extraflags" diff --git a/pkgs/subversion/subversion.fix b/pkgs/subversion/subversion.fix index a0048c08fef..c840d436670 100644 --- a/pkgs/subversion/subversion.fix +++ b/pkgs/subversion/subversion.fix @@ -4,7 +4,6 @@ Function(["localServer", "httpsClient", "httpServer", "pythonBindings"], [ ("name", "subversion-0.27.0") , ("build", Relative("subversion/subversion-build.sh")) - , ("setenv", Relative("helpers/set-env.sh")) , ("src", Call(IncludeFix("fetchurl/fetchurl.fix"), [ ("url", "http://subversion.tigris.org/files/documents/15/5642/subversion-0.27.0.tar.gz") @@ -25,4 +24,4 @@ Function(["localServer", "httpsClient", "httpServer", "pythonBindings"], , ("libxml", IncludeFix("libxml2/libxml2.fix")) ] ) -) \ No newline at end of file +) diff --git a/pkgs/swig/swig-build.sh b/pkgs/swig/swig-build.sh index 8f954c8eae8..b1cbafc752d 100755 --- a/pkgs/swig/swig-build.sh +++ b/pkgs/swig/swig-build.sh @@ -1,7 +1,5 @@ #! /bin/sh -export NIX_LDFLAGS=-Wl,-s - . $stdenv/setup || exit 1 tar xvfz $src || exit 1 diff --git a/pkgs/sylpheed/sylpheed-build.sh b/pkgs/sylpheed/sylpheed-build.sh index 95c49c648fe..fa2fd2827f4 100755 --- a/pkgs/sylpheed/sylpheed-build.sh +++ b/pkgs/sylpheed/sylpheed-build.sh @@ -1,15 +1,13 @@ #! /bin/sh -. $stdenv/setup || exit 1 - envpkgs="$gtk $ssl" -. $setenv || exit 1 +. $stdenv/setup || exit 1 export C_INCLUDE_PATH=$ssl/include:$C_INCLUDE_PATH tar xvfj $src || exit 1 cd sylpheed-* || exit 1 -LDFLAGS=-Wl,-S ./configure --prefix=$out --enable-ssl --disable-gdk-pixbuf --disable-imlibtest || exit 1 +./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 dd552e1175a..04e1e24f4cd 100644 --- a/pkgs/sylpheed/sylpheed.fix +++ b/pkgs/sylpheed/sylpheed.fix @@ -2,7 +2,6 @@ Package( [ ("name", "sylpheed-0.9.3") , ("build", Relative("sylpheed/sylpheed-build.sh")) - , ("setenv", Relative("helpers/set-env.sh")) , ("src", App(IncludeFix("fetchurl/fetchurl.fix"), [ ("url", "http://heanet.dl.sourceforge.net/sourceforge/sylpheed-claws/sylpheed-0.9.3.tar.bz2") diff --git a/pkgs/wxPython/wxPython.fix b/pkgs/wxPython/wxPython.fix index 2ebfc071098..af11edec723 100644 --- a/pkgs/wxPython/wxPython.fix +++ b/pkgs/wxPython/wxPython.fix @@ -2,7 +2,6 @@ Package( [ ("name", "wxPython-2.4.1.2") , ("build", Relative("wxPython/wxPython-build.sh")) - , ("setenv", Relative("helpers/set-env.sh")) , ("src", App(IncludeFix("fetchurl/fetchurl.fix"), [ ("url", "http://belnet.dl.sourceforge.net/sourceforge/wxpython/wxPythonSrc-2.4.1.2.tar.gz") diff --git a/pkgs/xtc/xtc-build.sh b/pkgs/xtc/xtc-build.sh index 895ed5b0bd3..ef70164c305 100755 --- a/pkgs/xtc/xtc-build.sh +++ b/pkgs/xtc/xtc-build.sh @@ -2,8 +2,6 @@ set -e -export NIX_LDFLAGS=-Wl,-s - . $stdenv/setup export PATH=$autoxt/bin:$PATH