summary refs log tree commit diff
path: root/pkgs/development/libraries/zlib
diff options
context:
space:
mode:
authorjanus <janus@xn--kn-1ia.guru>2015-11-28 15:06:15 +0000
committerjanus <janus@xn--kn-1ia.guru>2016-01-01 17:01:13 +0000
commit55aa9163cca34107b3e3ce7ce8d7bb76fa5717a0 (patch)
tree3e35217e4909c42136534ea37d887b04baa7a402 /pkgs/development/libraries/zlib
parenta472d836f674fe388018aaee75983e3400a77db4 (diff)
downloadnixpkgs-55aa9163cca34107b3e3ce7ce8d7bb76fa5717a0.tar
nixpkgs-55aa9163cca34107b3e3ce7ce8d7bb76fa5717a0.tar.gz
nixpkgs-55aa9163cca34107b3e3ce7ce8d7bb76fa5717a0.tar.bz2
nixpkgs-55aa9163cca34107b3e3ce7ce8d7bb76fa5717a0.tar.lz
nixpkgs-55aa9163cca34107b3e3ce7ce8d7bb76fa5717a0.tar.xz
nixpkgs-55aa9163cca34107b3e3ce7ce8d7bb76fa5717a0.tar.zst
nixpkgs-55aa9163cca34107b3e3ce7ce8d7bb76fa5717a0.zip
FreeBSD: minor fixes, add notes and make stdenv more robust
Diffstat (limited to 'pkgs/development/libraries/zlib')
-rw-r--r--pkgs/development/libraries/zlib/default.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix
index 99be5162010..7a6f480215c 100644
--- a/pkgs/development/libraries/zlib/default.nix
+++ b/pkgs/development/libraries/zlib/default.nix
@@ -31,7 +31,8 @@ stdenv.mkDerivation (rec {
 
   # As zlib takes part in the stdenv building, we don't want references
   # to the bootstrap-tools libgcc (as uses to happen on arm/mips)
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (!stdenv.isDarwin) "-static-libgcc " + stdenv.lib.optionalString (stdenv.isFreeBSD) "-fPIC";
+  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (!stdenv.isDarwin) "-static-libgcc "
+                     + stdenv.lib.optionalString (stdenv.isFreeBSD) "-fPIC";
 
   crossAttrs = {
     dontStrip = static;