Merge branch 'master.upstream' into staging.upstream

2015-06-22 10:57:36 -07:00
parent ad779acd3b 22172b8e43
commit 282d03befa
114 changed files with 1394 additions and 412 deletions
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -107,5 +107,8 @@ stdenv.mkDerivation rec {
    maintainers = [ lib.maintainers.wkennington ];
  };

-  passthru.ldflags = "-lncurses";
+  passthru = {
+    ldflags = "-lncurses";
+    inherit unicode abiVersion;
+  };
 }