git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #73277 from robashton/master

Initial stab at making X11 a configurable dependency of intel-media-drivers

commit95dc08e9723b975e880eaec69aca27168c290bb5 authorMichael Weiss <dev.primeos@gmail.com> dateFri 8 Jan 2021, 17:06 (6 years ago) parent71e02890e061a8
1 file changed+9−2
pkgs/development/libraries/intel-media-driver/default.nix+9−2
pkgs/development/libraries/intel-media-driver/default.nix+9−2
@@ -1,6 +1,7 @@
11{ stdenv, fetchFromGitHub
22, cmake, pkg-config
3−, libva, libpciaccess, intel-gmmlib, libX11
3+, libva, libpciaccess, intel-gmmlib
4+, enableX11 ? true, libX11
45}:
56
67stdenv.mkDerivation rec {
@@ -23,7 +24,8 @@ stdenv.mkDerivation rec {
2324
2425 nativeBuildInputs = [ cmake pkg-config ];
2526
26− buildInputs = [ libva libpciaccess intel-gmmlib libX11 ];
27+ buildInputs = [ libva libpciaccess intel-gmmlib ]
28+ ++ stdenv.lib.optional enableX11 libX11;
2729
2830 meta = with stdenv.lib; {
2931 description = "Intel Media Driver for VAAPI — Broadwell+ iGPUs";
@@ -38,4 +40,9 @@ stdenv.mkDerivation rec {
3840 platforms = platforms.linux;
3941 maintainers = with maintainers; [ primeos jfrankenau ];
4042 };
43+
44+ postFixup = stdenv.lib.optionalString enableX11 ''
45+ patchelf --set-rpath "$(patchelf --print-rpath $out/lib/dri/iHD_drv_video.so):${stdenv.lib.makeLibraryPath [ libX11 ]}" \
46+ $out/lib/dri/iHD_drv_video.so
47+ '';
4148}