push sheeet
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s

This commit is contained in:
Dark Steveneq
2025-10-09 14:15:47 +02:00
commit 646b892680
49168 changed files with 5897842 additions and 0 deletions

View File

@@ -0,0 +1,34 @@
From 4e8bd61c216969615a492043092bd8298dcd1410 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Mon, 6 Nov 2023 09:33:45 -0500
Subject: [PATCH] hardcode install_dir
partially revert https://github.com/elFarto/nvidia-vaapi-driver/commit/60ab79608ae35bd929d3e1387d226547d18e6bed
---
meson.build | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/meson.build b/meson.build
index 990c2b2..f5e63d7 100644
--- a/meson.build
+++ b/meson.build
@@ -71,7 +71,6 @@ if gst_codecs_deps.found()
endif
nvidia_incdir = include_directories('nvidia-include')
-nvidia_install_dir = libva_deps.get_variable(pkgconfig: 'driverdir')
shared_library(
'nvidia_drv_video',
@@ -80,7 +79,7 @@ shared_library(
dependencies: deps,
include_directories: nvidia_incdir,
install: true,
- install_dir: nvidia_install_dir,
+ install_dir: get_option('libdir') / 'dri',
gnu_symbol_visibility: 'hidden',
)
--
2.42.0

View File

@@ -0,0 +1,58 @@
{
stdenv,
fetchFromGitHub,
lib,
meson,
ninja,
pkg-config,
libdrm,
libGL,
gst_all_1,
nv-codec-headers-11,
libva,
addDriverRunpath,
}:
stdenv.mkDerivation rec {
pname = "nvidia-vaapi-driver";
version = "0.0.14";
src = fetchFromGitHub {
owner = "elFarto";
repo = "nvidia-vaapi-driver";
rev = "v${version}";
sha256 = "sha256-Nf2Qh+POkcKXjiHlmpfSCbY+vgT63bWIaMxQHHYtE04=";
};
patches = [
./0001-hardcode-install_dir.patch
];
nativeBuildInputs = [
meson
ninja
pkg-config
addDriverRunpath
];
buildInputs = [
libdrm
libGL
gst_all_1.gstreamer
gst_all_1.gst-plugins-bad
nv-codec-headers-11
libva
];
postFixup = ''
addDriverRunpath "$out/lib/dri/nvidia_drv_video.so"
'';
meta = with lib; {
homepage = "https://github.com/elFarto/nvidia-vaapi-driver";
description = "VA-API implemention using NVIDIA's NVDEC";
changelog = "https://github.com/elFarto/nvidia-vaapi-driver/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ nickcao ];
};
}