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

Sandro 38cc8b5f 7bf7f369

Changed files
+27 -10
pkgs
development
libraries
intel-gmmlib
intel-media-driver
+2 -2
pkgs/development/libraries/intel-gmmlib/default.nix
···
src = fetchFromGitHub {
owner = "intel";
repo = "gmmlib";
-
rev = "${pname}-${version}";
+
rev = "intel-gmmlib-${version}";
sha256 = "0dzqfgbd0fxl8rxgf5nmj1jd4izzaqfb0s53l96qwz1j57q5ybj5";
};
···
OpenCL(TM) and the Intel(R) Media Driver for VAAPI.
'';
platforms = [ "x86_64-linux" "i686-linux" ];
-
maintainers = with maintainers; [ primeos ];
+
maintainers = with maintainers; [ primeos SuperSandro2000 ];
};
}
+25 -8
pkgs/development/libraries/intel-media-driver/default.nix
···
-
{ lib, stdenv, fetchFromGitHub
-
, cmake, pkg-config
-
, libva, libpciaccess, intel-gmmlib
-
, enableX11 ? stdenv.isLinux, libX11
+
{ lib
+
, stdenv
+
, fetchFromGitHub
+
, fetchpatch
+
, cmake
+
, pkg-config
+
, libva
+
, libpciaccess
+
, intel-gmmlib
+
, enableX11 ? stdenv.isLinux
+
, libX11
}:
stdenv.mkDerivation rec {
···
outputs = [ "out" "dev" ];
src = fetchFromGitHub {
-
owner = "intel";
-
repo = "media-driver";
-
rev = "intel-media-${version}";
+
owner = "intel";
+
repo = "media-driver";
+
rev = "intel-media-${version}";
sha256 = "1ch1bvqg6p0i7ahblhy0h9c43y2mfhqb25v1s344iqsrywwcpzzr";
};
+
patches = [
+
# fix platform detection
+
(fetchpatch {
+
url = "https://salsa.debian.org/multimedia-team/intel-media-driver-non-free/-/raw/master/debian/patches/0002-Remove-settings-based-on-ARCH.patch";
+
sha256 = "sha256-f4M0CPtAVf5l2ZwfgTaoPw7sPuAP/Uxhm5JSHEGhKT0=";
+
})
+
];
+
cmakeFlags = [
"-DINSTALL_DRIVER_SYSCONF=OFF"
"-DLIBVA_DRIVERS_PATH=${placeholder "out"}/lib/dri"
# Works only on hosts with suitable CPUs.
"-DMEDIA_RUN_TEST_SUITE=OFF"
];
+
+
NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.hostPlatform.system == "i686-linux") "-D_FILE_OFFSET_BITS=64";
nativeBuildInputs = [ cmake pkg-config ];
···
changelog = "https://github.com/intel/media-driver/releases/tag/intel-media-${version}";
license = with licenses; [ bsd3 mit ];
platforms = platforms.linux;
-
maintainers = with maintainers; [ primeos jfrankenau ];
+
maintainers = with maintainers; [ primeos jfrankenau SuperSandro2000 ];
};
}