JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Get rid of all `-S' flags (to remove debug info); this is now the default.

Browse Source 
* Remove all references to set-env.sh; it has been merged into stdenv.fix (actually 
  baseenv.fix).

svn path=/nixpkgs/trunk/; revision=316
This commit is contained in:
Eelco Dolstra 2003-08-18 19:52:54 +00:00
parent 287225e1e1
commit 23154d034f
50 changed files with 27 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/MPlayer/MPlayer-build.sh
View File

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

1
pkgs/MPlayer/MPlayer.fix
View File

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

6
pkgs/Xft/Xft-build.sh
View File

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

1
pkgs/Xft/Xft.fix
View File

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

2
pkgs/aterm/aterm-build.sh
View File

@ -1,7 +1,5 @@
#! /bin/sh
export NIX_LDFLAGS=-Wl,-s
. $stdenv/setup || exit 1
tar xvfz $src || exit 1

8
pkgs/atk/atk-build.sh
View File

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

1
pkgs/atk/atk.fix
View File

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

2
pkgs/autoxt/autoxt-build.sh
View File

@ -1,7 +1,5 @@
#! /bin/sh
export NIX_LDFLAGS=-Wl,-s
. $stdenv/setup || exit 1
echo "out: $out"

2
pkgs/db4/db4-build.sh
View File

@ -1,7 +1,5 @@
#! /bin/sh
export NIX_LDFLAGS=-Wl,-s
. $stdenv/setup || exit 1
tar xvfz $src || exit 1

2
pkgs/expat/expat-build.sh
View File

@ -1,7 +1,5 @@
#! /bin/sh
export NIX_LDFLAGS=-Wl,-s
. $stdenv/setup || exit 1
tar xvfz $src || exit 1

8
pkgs/firebird/firebird-build.sh
View File

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

1
pkgs/firebird/firebird.fix
View File

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

6
pkgs/fontconfig/fontconfig-build.sh
View File

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

1
pkgs/fontconfig/fontconfig.fix
View File

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

2
pkgs/freetype/freetype-build.sh
View File

@ -1,7 +1,5 @@
#! /bin/sh
export NIX_LDFLAGS=-Wl,-s
. $stdenv/setup || exit 1
tar xvfj $src || exit 1

2
pkgs/glib-1/glib-build.sh
View File

@ -1,7 +1,5 @@
#! /bin/sh
export NIX_LDFLAGS=-Wl,-s
. $stdenv/setup || exit 1
tar xvfz $src || exit 1

3
pkgs/glib/glib-build.sh
View File

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

6
pkgs/gnet/gnet-build.sh
View File

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

1
pkgs/gnet/gnet.fix
View File

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

6
pkgs/gtk+-1/gtk+-build.sh
View File

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

1
pkgs/gtk+-1/gtk+.fix
View File

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

8
pkgs/gtk+/gtk+-build.sh
View File

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

1
pkgs/gtk+/gtk+.fix
View File

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

8
pkgs/gtkspell/gtkspell-build.sh
View File

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

1
pkgs/gtkspell/gtkspell.fix
View File

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

6
pkgs/httpd/httpd-build.sh
View File

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

1
pkgs/httpd/httpd.fix
View File

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

8
pkgs/libIDL/libIDL-build.sh
View File

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

1
pkgs/libIDL/libIDL.fix
View File

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

2
pkgs/libxml2/libxml2-build.sh
View File

@ -1,7 +1,5 @@
#! /bin/sh
export NIX_LDFLAGS=-Wl,-s
. $stdenv/setup || exit 1
tar xvfz $src || exit 1

6
pkgs/libxslt/libxslt-build.sh
View File

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

1
pkgs/libxslt/libxslt.fix
View File

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

5
pkgs/openssl/openssl-build.sh
View File

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

1
pkgs/openssl/openssl.fix
View File

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

8
pkgs/pan/pan-build.sh
View File

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

1
pkgs/pan/pan.fix
View File

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

8
pkgs/pango/pango-build.sh
View File

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

1
pkgs/pango/pango.fix
View File

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

2
pkgs/pkgconfig/pkgconfig-build.sh
View File

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

2
pkgs/pspell/pspell-build.sh
View File

@ -1,7 +1,5 @@
#! /bin/sh
export NIX_LDFLAGS=-Wl,-s
. $stdenv/setup || exit 1
tar xvfz $src || exit 1

2
pkgs/sdf2/sdf2-build.sh
View File

@ -1,7 +1,5 @@
#! /bin/sh
export NIX_LDFLAGS=-Wl,-s
. $stdenv/setup || exit 1
tar xvfz $src || exit 1

2
pkgs/srts/srts-build.sh
View File

@ -2,8 +2,6 @@
set -e
export NIX_LDFLAGS=-Wl,-s
. $stdenv/setup
export PATH=$autoxt/bin:$PATH

2
pkgs/strategoxt-0.9.2/strategoxt-build.sh
View File

@ -1,7 +1,5 @@
#! /bin/sh
export NIX_LDFLAGS=-Wl,-s
. $stdenv/setup || exit 1
tar xvfz $src || exit 1

6
pkgs/subversion/subversion-build.sh
View File

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

3
pkgs/subversion/subversion.fix
View File

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

2
pkgs/swig/swig-build.sh
View File

@ -1,7 +1,5 @@
#! /bin/sh
export NIX_LDFLAGS=-Wl,-s
. $stdenv/setup || exit 1
tar xvfz $src || exit 1

6
pkgs/sylpheed/sylpheed-build.sh
View File

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

1
pkgs/sylpheed/sylpheed.fix
View File

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

1
pkgs/wxPython/wxPython.fix
View File

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

2
pkgs/xtc/xtc-build.sh
View File

@ -2,8 +2,6 @@
set -e
export NIX_LDFLAGS=-Wl,-s
. $stdenv/setup
export PATH=$autoxt/bin:$PATH