diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-11-16 12:53:32 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-11-16 12:53:32 +0100 |
| commit | 67419f0e56f99b0ebbe14574d3492110ac84c8d6 (patch) | |
| tree | 3abc8e1606a2c80b6f5d14fef175e50800202163 /nixpkgs/pkgs/development/libraries/nvidia-vaapi-driver | |
| parent | a2c1eff83c3118a9aee8076c7f84f58137416b6e (diff) | |
| parent | 9008bc4eb62c878d0812105ea1b34255d651df88 (diff) | |
| download | nixlib-67419f0e56f99b0ebbe14574d3492110ac84c8d6.tar nixlib-67419f0e56f99b0ebbe14574d3492110ac84c8d6.tar.gz nixlib-67419f0e56f99b0ebbe14574d3492110ac84c8d6.tar.bz2 nixlib-67419f0e56f99b0ebbe14574d3492110ac84c8d6.tar.lz nixlib-67419f0e56f99b0ebbe14574d3492110ac84c8d6.tar.xz nixlib-67419f0e56f99b0ebbe14574d3492110ac84c8d6.tar.zst nixlib-67419f0e56f99b0ebbe14574d3492110ac84c8d6.zip | |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs into HEAD
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/nvidia-vaapi-driver')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/nvidia-vaapi-driver/0001-hardcode-install_dir.patch | 34 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/nvidia-vaapi-driver/default.nix | 8 |
2 files changed, 40 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/development/libraries/nvidia-vaapi-driver/0001-hardcode-install_dir.patch b/nixpkgs/pkgs/development/libraries/nvidia-vaapi-driver/0001-hardcode-install_dir.patch new file mode 100644 index 000000000000..05de63806fb0 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/nvidia-vaapi-driver/0001-hardcode-install_dir.patch @@ -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 + diff --git a/nixpkgs/pkgs/development/libraries/nvidia-vaapi-driver/default.nix b/nixpkgs/pkgs/development/libraries/nvidia-vaapi-driver/default.nix index 4a1976be2915..60ef649ec5ad 100644 --- a/nixpkgs/pkgs/development/libraries/nvidia-vaapi-driver/default.nix +++ b/nixpkgs/pkgs/development/libraries/nvidia-vaapi-driver/default.nix @@ -14,15 +14,19 @@ stdenv.mkDerivation rec { pname = "nvidia-vaapi-driver"; - version = "0.0.10"; + version = "0.0.11"; src = fetchFromGitHub { owner = "elFarto"; repo = pname; rev = "v${version}"; - sha256 = "sha256-j6AIleVZCgV7CD7nP/dKz5we3sUW9pldy0QKi8xwXB0="; + sha256 = "sha256-mVVRpCyT374P1Vql0yPY0e5tNktHNJ8XHoixvxp3b20="; }; + patches = [ + ./0001-hardcode-install_dir.patch + ]; + nativeBuildInputs = [ meson ninja |