Merge branch 'master' into staging

1 files changed, 13 insertions, 12 deletions

diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/development/libraries/libtasn1/default.nix
index 34727c1e5f64..150e7455c032 100644
--- a/pkgs/development/libraries/libtasn1/default.nix
+++ b/pkgs/development/libraries/libtasn1/default.nix
@@ -11,23 +11,24 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" "devdoc" ];
   outputBin = "dev";
 
+  # Warning causes build to fail on darwin since 4.9,
+  # check if this can be removed in the next release.
+  CFLAGS = "-Wno-sign-compare";
+
   buildInputs = [ perl texinfo ];
 
   doCheck = true;
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://www.gnu.org/software/libtasn1/;
     description = "An ASN.1 library";
-
-    longDescription =
-      '' Libtasn1 is the ASN.1 library used by GnuTLS, GNU Shishi and some
-         other packages.  The goal of this implementation is to be highly
-         portable, and only require an ANSI C89 platform.
-      '';
-
-    license = stdenv.lib.licenses.lgpl2Plus;
-
-    maintainers = with stdenv.lib.maintainers; [ wkennington ];
-    platforms = stdenv.lib.platforms.all;
+    longDescription = ''
+      Libtasn1 is the ASN.1 library used by GnuTLS, GNU Shishi and some
+      other packages.  The goal of this implementation is to be highly
+      portable, and only require an ANSI C89 platform.
+    '';
+    license = licenses.lgpl2Plus;
+    maintainers = with maintainers; [ wkennington ];
+    platforms = platforms.all;
   };
 }