Merge master into staging-next

2019-08-31 18:04:31 +02:00
parent 4b515cf6ef cbbe9f0f21
commit 96e5474329
33 changed files with 545 additions and 165 deletions
--- a/pkgs/development/libraries/vulkan-headers/default.nix
+++ b/pkgs/development/libraries/vulkan-headers/default.nix
@@ -3,13 +3,13 @@ stdenv.mkDerivation rec {
  pname = "vulkan-headers";
  version = "1.1.106";

-  buildInputs = [ cmake ];
+  nativeBuildInputs = [ cmake ];

  src = fetchFromGitHub {
    owner = "KhronosGroup";
    repo = "Vulkan-Headers";
    rev = "sdk-${version}";
-    sha256 = "0idw7q715ikj575qmspvgq2gzc6c1sj581b8z3xnv6wz9qbzrmsd";
+    sha256 = "0fdvh26nxibylh32lj8b62d9nf9j25xa0il9zg362wmr2zgm8gka";
  };

  meta = with stdenv.lib; {