virglrenderer: refactor

Author: Jasi

pkgs/by-name/vi/virglrenderer/package.nix

@@ -11,13 +11,13 @@
   libX11,
   libdrm,
   libgbm,
-  nativeContextSupport ? stdenv.hostPlatform.isLinux,
-  vaapiSupport ? !stdenv.hostPlatform.isDarwin,
   libva,
-  vulkanSupport ? stdenv.hostPlatform.isLinux,
   vulkan-headers,
   vulkan-loader,
   nix-update-script,
+  vulkanSupport ? stdenv.hostPlatform.isLinux,
+  nativeContextSupport ? stdenv.hostPlatform.isLinux,
+  vaapiSupport ? !stdenv.hostPlatform.isDarwin,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -34,36 +34,43 @@ stdenv.mkDerivation (finalAttrs: {
 
   separateDebugInfo = true;
 
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    (buildPackages.python3.withPackages (ps: [
+      ps.pyyaml
+    ]))
+  ];
+
   buildInputs = [
     libepoxy
   ]
-  ++ lib.optionals vaapiSupport [ libva ]
-  ++ lib.optionals vulkanSupport [
-    vulkan-headers
-    vulkan-loader
-  ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     libGLU
     libX11
     libdrm
     libgbm
-  ];
-
-  nativeBuildInputs = [
-    meson
-    ninja
-    pkg-config
-    (buildPackages.python3.withPackages (ps: [
-      ps.pyyaml
-    ]))
+  ]
+  ++ lib.optionals vaapiSupport [
+    libva
+  ]
+  ++ lib.optionals vulkanSupport [
+    vulkan-headers
+    vulkan-loader
   ];
 
   mesonFlags = [
     (lib.mesonBool "video" vaapiSupport)
     (lib.mesonBool "venus" vulkanSupport)
-  ]
-  ++ lib.optionals nativeContextSupport [
-    (lib.mesonOption "drm-renderers" "amdgpu-experimental,msm")
+    (lib.mesonOption "drm-renderers" (
+      lib.optionalString nativeContextSupport (
+        lib.concatStringsSep "," [
+          "amdgpu-experimental"
+          "msm"
+        ]
+      )
+    ))
   ];
 
   passthru = {