Merge commit '2d464f75ed46869b5942c4b479772a0367b30608' into master.upstream

This is a partial commit from staging in an attempt to make merges smaller.
2015-09-23 14:35:23 -07:00
parent 0d0be13878 2d464f75ed
commit 5cfe893cc4
32 changed files with 3689 additions and 257 deletions
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -93,6 +93,10 @@ in
    outputs = [ "out" "man" ];
  };

+  libAppleWM = attrs: attrs // {
+    propagatedBuildInputs = [ args.apple_sdk.frameworks.ApplicationServices ];
+  };
+
  libXfont = attrs: attrs // {
    propagatedBuildInputs = [ args.freetype ]; # propagate link reqs. like bzip2
    # prevents "misaligned_stack_error_entering_dyld_stub_binder"