Merge pull request #210795 from Stunkymonkey/vkdt-nativeBuildInputs

vkdt: separate buildInputs and add wayland package

pkgs/applications/graphics/vkdt/default.nix

@@ -30,25 +30,31 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-IMCS6bJqOzPeAFZyQtjzd1rQ5ugIevqoFUW6Y0w1Pzs=";
   };
 
-  buildInputs = [
-    vulkan-headers
-    vulkan-tools
-    vulkan-loader
-    glslang
-    glfw
-    libjpeg
-    pkg-config
-    rsync
-    cmake
+  strictDeps = true;
+
+  nativeBuildInputs = [
     clang
+    cmake
+    glslang
     llvm
     llvmPackages.openmp
-    pugixml
-    freetype
+    pkg-config
+    rsync
+  ];
+
+  buildInputs = [
     exiv2
     ffmpeg
-    libvorbis
+    freetype
+    glfw
+    libjpeg
     libmad
+    libvorbis
+    llvmPackages.openmp
+    pugixml
+    vulkan-headers
+    vulkan-loader
+    vulkan-tools
   ];
 
   dontUseCmakeConfigure = true;
@@ -60,5 +66,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/hanatos/vkdt";
     license = licenses.bsd2;
     maintainers = with maintainers; [ paperdigits ];
+    platforms = platforms.linux;
+    broken = stdenv.isAarch64;
   };
 }

pkgs/top-level/all-packages.nix

@@ -23494,6 +23494,8 @@ with pkgs;
 
   vkdt = callPackage ../applications/graphics/vkdt { };
 
+  vkdt-wayland = callPackage ../applications/graphics/vkdt { glfw = glfw-wayland; };
+
   vlock = callPackage ../misc/screensavers/vlock { };
 
   virtualpg = callPackage ../development/libraries/virtualpg { };