diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-11-08 00:32:12 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-11-08 00:32:12 +0000 |
| commit | 4b27d2870197b26b7c170caa333944231715d4a3 (patch) | |
| tree | 6b781861cb96e9ce0660ca0b904ed3dda1cc6905 /pkgs/tools/compression/bzip2 | |
| parent | 6e86ca940f9cb7fdbbf8663bc5c19af45fbc1e17 (diff) | |
| download | nixlib-4b27d2870197b26b7c170caa333944231715d4a3.tar nixlib-4b27d2870197b26b7c170caa333944231715d4a3.tar.gz nixlib-4b27d2870197b26b7c170caa333944231715d4a3.tar.bz2 nixlib-4b27d2870197b26b7c170caa333944231715d4a3.tar.lz nixlib-4b27d2870197b26b7c170caa333944231715d4a3.tar.xz nixlib-4b27d2870197b26b7c170caa333944231715d4a3.tar.zst nixlib-4b27d2870197b26b7c170caa333944231715d4a3.zip | |
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
Diffstat (limited to 'pkgs/tools/compression/bzip2')
| -rw-r--r-- | pkgs/tools/compression/bzip2/default.nix | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix index ddc31de6196b..0523067cbade 100644 --- a/pkgs/tools/compression/bzip2/default.nix +++ b/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; |