diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-06-16 06:56:35 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-06-16 06:56:35 +0000 |
| commit | 99fcaeccb89621dd492203ce1f2d551c06f228ed (patch) | |
| tree | 41cb730ae07383004789779b0f6e11cb3f4642a3 /nixpkgs/pkgs/development/libraries/nvidia-vaapi-driver | |
| parent | 59c5f5ac8682acc13bb22bc29c7cf02f7d75f01f (diff) | |
| parent | 75a5ebf473cd60148ba9aec0d219f72e5cf52519 (diff) | |
| download | nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.gz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.bz2 nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.lz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.xz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.zst nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.zip | |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/nixos/modules/config/console.nix nixpkgs/nixos/modules/services/mail/mailman.nix nixpkgs/nixos/modules/services/mail/public-inbox.nix nixpkgs/nixos/modules/services/mail/rss2email.nix nixpkgs/nixos/modules/services/networking/ssh/sshd.nix nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix nixpkgs/pkgs/applications/networking/irc/weechat/default.nix nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/interpreters/python/default.nix nixpkgs/pkgs/development/node-packages/overrides.nix nixpkgs/pkgs/development/tools/b4/default.nix nixpkgs/pkgs/servers/dict/dictd-db.nix nixpkgs/pkgs/servers/mail/public-inbox/default.nix nixpkgs/pkgs/tools/security/pinentry/default.nix nixpkgs/pkgs/tools/text/unoconv/default.nix nixpkgs/pkgs/top-level/all-packages.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/nvidia-vaapi-driver')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/nvidia-vaapi-driver/default.nix | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/development/libraries/nvidia-vaapi-driver/default.nix b/nixpkgs/pkgs/development/libraries/nvidia-vaapi-driver/default.nix index 7225efad2f68..5e559af9357b 100644 --- a/nixpkgs/pkgs/development/libraries/nvidia-vaapi-driver/default.nix +++ b/nixpkgs/pkgs/development/libraries/nvidia-vaapi-driver/default.nix @@ -4,6 +4,7 @@ , meson , ninja , pkg-config +, libdrm , libGL , gst_all_1 , nv-codec-headers-11 @@ -13,13 +14,13 @@ stdenv.mkDerivation rec { pname = "nvidia-vaapi-driver"; - version = "0.0.6"; + version = "0.0.9"; src = fetchFromGitHub { owner = "elFarto"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/9PCqjs0hiIM7ZLvDesff5Bh0a1B8/w/CTw62spw+j4="; + sha256 = "sha256-mQtprgm6QonYiMUPPIcCbWxPQ/b2XuQiOkROZNPYaQk="; }; nativeBuildInputs = [ @@ -30,6 +31,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + libdrm libGL gst_all_1.gstreamer gst_all_1.gst-plugins-bad @@ -37,6 +39,14 @@ stdenv.mkDerivation rec { libva ]; + # Note: Attempt to remove on next release after 0.0.9 + # nixpkgs reference: https://github.com/NixOS/nixpkgs/pull/221978#issuecomment-1483892437 + # upstream: https://github.com/elFarto/nvidia-vaapi-driver/issues/188 + NIX_CFLAGS_COMPILE = [ + "-Wno-error=format=" + "-Wno-error=int-conversion" + ]; + postFixup = '' addOpenGLRunpath "$out/lib/dri/nvidia_drv_video.so" ''; @@ -44,6 +54,7 @@ stdenv.mkDerivation rec { meta = with lib;{ homepage = "https://github.com/elFarto/nvidia-vaapi-driver"; description = "A 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 ]; }; |