Merge commit '3ab2949' from staging into master

Conflicts: pkgs/development/compilers/llvm/6/llvm.nix pkgs/servers/home-assistant/component-packages.nix
2018-03-15 22:30:56 +02:00
parent 208abe9ae3 3ab2949e1f
commit ef64208eba
323 changed files with 2064 additions and 3432 deletions
@@ -16,6 +16,7 @@
 , debugVersion ? false
 , enableManpages ? false
 , enableSharedLibraries ? true
+, enableWasm ? true
 , darwin
 }:

@@ -113,7 +114,9 @@ in stdenv.mkDerivation (rec {
    "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}"
    "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}"
    "-DTARGET_TRIPLE=${stdenv.targetPlatform.config}"
-  ];
+  ] ++ stdenv.lib.optional enableWasm
+   "-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly"
+  ;

  postBuild = ''
    rm -fR $out