Porting changes from stdenv-updates into this branch.

This comes from:
svn diff  ^/nixpkgs/trunk/@18255 ^/nixpkgs/branches/stdenv-updates/ > diff
patch -p0 < diff
and then adding into svn all files new from the patch.

trunk@18255 comes from the last time I updated stdenv-updates from trunk.


svn path=/nixpkgs/stdenv-updates2/; revision=18272

pkgs/tools/compression/bzip2/default.nix

@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{stdenv, fetchurl, linkStatic ? false}:
 
 stdenv.mkDerivation {
   name = "bzip2-1.0.5";
@@ -11,7 +11,11 @@ stdenv.mkDerivation {
   };
 
   sharedLibrary =
-    !stdenv.isDarwin && !(stdenv ? isDietLibC) && !(stdenv ? isStatic) && stdenv.system != "i686-cygwin";
+    !stdenv.isDarwin && !(stdenv ? isDietLibC) && !(stdenv ? isStatic) && stdenv.system != "i686-cygwin" && !linkStatic;
+
+  makeFlags = if linkStatic then "LDFLAGS=-static" else "";
+
+  inherit linkStatic;
     
   meta = {
     homepage = http://www.bzip.org;