Merge remote-tracking branch 'upstream/master' into hardened-stdenv

2016-08-03 13:34:44 +00:00
parent 3f9e8601f2 d93f917182
commit 1b979d8384
1099 changed files with 2664 additions and 513 deletions
--- a/pkgs/development/libraries/fribidi/default.nix
+++ b/pkgs/development/libraries/fribidi/default.nix
@@ -15,5 +15,6 @@ stdenv.mkDerivation rec {
    homepage = http://fribidi.org/;
    description = "GNU implementation of the Unicode Bidirectional Algorithm (bidi)";
    license = licenses.gpl2;
+    platforms = platforms.unix;
  };
 }