Merge branch 'master' into staging

2017-01-04 23:20:27 +01:00
parent a3018650a3 000fb9be33
commit ea7b252c9a
29 changed files with 1375 additions and 1156 deletions
--- a/pkgs/development/compilers/glslang/default.nix
+++ b/pkgs/development/compilers/glslang/default.nix
@@ -21,5 +21,7 @@ stdenv.mkDerivation rec {
  meta = with stdenv.lib; {
    inherit (src.meta) homepage;
    description = "Khronos reference front-end for GLSL and ESSL";
+    license = licenses.asl20;
+    platforms = platforms.linux;
  };
 }