Skip to content

Commit cf89037

Browse files
authored
virglrenderer: refactor; add myself as maintainer (#432171)
2 parents 4be93c9 + accd401 commit cf89037

1 file changed

Lines changed: 46 additions & 37 deletions

File tree

Lines changed: 46 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
lib,
33
stdenv,
4-
fetchurl,
4+
fetchFromGitLab,
55
meson,
66
ninja,
77
pkg-config,
@@ -11,71 +11,80 @@
1111
libX11,
1212
libdrm,
1313
libgbm,
14-
nativeContextSupport ? stdenv.hostPlatform.isLinux,
15-
vaapiSupport ? !stdenv.hostPlatform.isDarwin,
1614
libva,
17-
vulkanSupport ? stdenv.hostPlatform.isLinux,
1815
vulkan-headers,
1916
vulkan-loader,
20-
gitUpdater,
17+
nix-update-script,
18+
vulkanSupport ? stdenv.hostPlatform.isLinux,
19+
nativeContextSupport ? stdenv.hostPlatform.isLinux,
20+
vaapiSupport ? !stdenv.hostPlatform.isDarwin,
2121
}:
2222

23-
stdenv.mkDerivation rec {
23+
stdenv.mkDerivation (finalAttrs: {
2424
pname = "virglrenderer";
2525
version = "1.1.1";
2626

27-
src = fetchurl {
28-
url = "https://gitlab.freedesktop.org/virgl/virglrenderer/-/archive/${version}/virglrenderer-${version}.tar.bz2";
29-
hash = "sha256-D+SJqBL76z1nGBmcJ7Dzb41RvFxU2Ak6rVOwDRB94rM=";
27+
src = fetchFromGitLab {
28+
domain = "gitlab.freedesktop.org";
29+
owner = "virgl";
30+
repo = "virglrenderer";
31+
tag = finalAttrs.version;
32+
hash = "sha256-ah6+AAf7B15rPMb4uO873wieT3+gf/5iGH+ZFoZKAAI=";
3033
};
3134

3235
separateDebugInfo = true;
3336

37+
nativeBuildInputs = [
38+
meson
39+
ninja
40+
pkg-config
41+
(buildPackages.python3.withPackages (ps: [
42+
ps.pyyaml
43+
]))
44+
];
45+
3446
buildInputs = [
3547
libepoxy
3648
]
37-
++ lib.optionals vaapiSupport [ libva ]
38-
++ lib.optionals vulkanSupport [
39-
vulkan-headers
40-
vulkan-loader
41-
]
4249
++ lib.optionals stdenv.hostPlatform.isLinux [
4350
libGLU
4451
libX11
4552
libdrm
4653
libgbm
47-
];
48-
49-
nativeBuildInputs = [
50-
meson
51-
ninja
52-
pkg-config
53-
(buildPackages.python3.withPackages (ps: [
54-
ps.pyyaml
55-
]))
54+
]
55+
++ lib.optionals vaapiSupport [
56+
libva
57+
]
58+
++ lib.optionals vulkanSupport [
59+
vulkan-headers
60+
vulkan-loader
5661
];
5762

5863
mesonFlags = [
5964
(lib.mesonBool "video" vaapiSupport)
6065
(lib.mesonBool "venus" vulkanSupport)
61-
]
62-
++ lib.optionals nativeContextSupport [
63-
(lib.mesonOption "drm-renderers" "amdgpu-experimental,msm")
66+
(lib.mesonOption "drm-renderers" (
67+
lib.optionalString nativeContextSupport (
68+
lib.concatStringsSep "," [
69+
"amdgpu-experimental"
70+
"msm"
71+
]
72+
)
73+
))
6474
];
6575

6676
passthru = {
67-
updateScript = gitUpdater {
68-
url = "https://gitlab.freedesktop.org/virgl/virglrenderer.git";
69-
rev-prefix = "virglrenderer-";
70-
};
77+
updateScript = nix-update-script { };
7178
};
7279

73-
meta = with lib; {
74-
description = "Virtual 3D GPU library that allows a qemu guest to use the host GPU for accelerated 3D rendering";
80+
meta = {
81+
description = "Virtual 3D GPU for use inside QEMU virtual machines";
82+
homepage = "https://docs.mesa3d.org/drivers/virgl";
83+
license = lib.licenses.mit;
84+
maintainers = with lib.maintainers; [
85+
normalcea
86+
];
7587
mainProgram = "virgl_test_server";
76-
homepage = "https://virgil3d.github.io/";
77-
license = licenses.mit;
78-
platforms = platforms.unix;
79-
maintainers = [ maintainers.xeji ];
88+
platforms = lib.platforms.unix;
8089
};
81-
}
90+
})

0 commit comments

Comments
 (0)