* 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/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

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