Unverified Commit deee0b94 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #187796 from SuperSandro2000/intel-media-driver

parents d941f93a d3a584eb

pkgs/development/libraries/intel-media-driver/default.nix

+8 −2
Original line number Diff line number Diff line
@@ -10,11 +10,13 @@ 
, libdrm

, enableX11 ? stdenv.isLinux

, libX11

  # for passhtru.tests

, pkgsi686Linux

}:



stdenv.mkDerivation rec {

  pname = "intel-media-driver";

  version = "22.5.0";

  version = "22.5.2";



  outputs = [ "out" "dev" ];
@@ -22,7 +24,7 @@ stdenv.mkDerivation rec { 
    owner = "intel";

    repo = "media-driver";

    rev = "intel-media-${version}";

    sha256 = "sha256-8E3MN4a+k8YA+uuUPApYFvT82bgJHE1cnPyuAO6R1tA=";

    sha256 = "sha256-3WqmTM68XdQfGibkVAT1S9N7Cn8eviNM6qUeF8qogtc=";

  };



  patches = [
@@ -58,6 +60,10 @@ stdenv.mkDerivation rec { 
      $out/lib/dri/iHD_drv_video.so

  '';



  passthru.tests = {

    inherit (pkgsi686Linux) intel-media-driver;

  };



  meta = with lib; {

    description = "Intel Media Driver for VAAPI — Broadwell+ iGPUs";

    longDescription = ''

pkgs/development/python-modules/setuptools-scm/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ buildPythonPackage rec { 
    "setuptools_scm"

  ];



  # check in passhtru.tests.pytest to escape infinite recursion on pytest

  # check in passthru.tests.pytest to escape infinite recursion on pytest

  doCheck = false;



  passthru.tests = {