* Got rid of all --disable-static flags; they're redundant now.

* Also a bunch of style cleanups (tabs, with args, ...).

svn path=/nixpkgs/branches/stdenv-updates/; revision=15235

pkgs/servers/sql/mysql5/default.nix

@@ -12,7 +12,7 @@ stdenv.mkDerivation {
 
   buildInputs = [ps ncurses zlib perl openssl];
   
-  configureFlags = "--enable-thread-safe-client --disable-static --with-openssl=${openssl} --with-berkeley-db --with-embedded-server" +
+  configureFlags = "--enable-thread-safe-client --with-openssl=${openssl} --with-berkeley-db --with-embedded-server" +
     (if stdenv.system == "x86_64-linux" then " --with-lib-ccflags=-fPIC" else "");
 
   NIX_CFLAGS_COMPILE = if stdenv.system == "x86_64-linux" then "-fPIC" else "";

pkgs/servers/x11/xorg/builder.sh

@@ -1,11 +1,10 @@
-# This is the builder for all X11R7 components.
+# This is the builder for all X.org components.
 source $stdenv/setup
 
 
 # After installation, automatically add all "Requires" fields in the
 # pkgconfig files (*.pc) to the propagated build inputs.
 origPostInstall=$postInstall
-postInstall=postInstall
 postInstall() {
     if test -n "$origPostInstall"; then eval "$origPostInstall"; fi
 
@@ -17,7 +16,6 @@ postInstall() {
 
     for r in $requires; do
         for p in $pkgs; do
-#            echo $r $p
             if test -e $p/lib/pkgconfig/$r.pc; then
                 echo "  found requisite $r in $p"
                 propagatedBuildInputs="$propagatedBuildInputs $p"
@@ -30,9 +28,6 @@ postInstall() {
 }
 
 
-configureFlags="--disable-static $configureFlags"
-
-
 installFlags="appdefaultdir=$out/share/X11/app-defaults"