diff options
| author | Michael Weiss <dev.primeos@gmail.com> | 2021-12-30 15:46:40 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-30 15:46:40 +0100 |
| commit | 09930ec7d090cdffd0f66783c94c98c7f7529bfc (patch) | |
| tree | 3578b1800e563dc0dd36a937c8d73bb3d82e04f7 | |
| parent | 4f3c8f9d97937540baa2f7c62cb8f83d1ab89b5b (diff) | |
| parent | 7e5337bbcfb2d1f6878b34b1a6432afa40d494a4 (diff) | |
| download | nixpkgs-09930ec7d090cdffd0f66783c94c98c7f7529bfc.tar nixpkgs-09930ec7d090cdffd0f66783c94c98c7f7529bfc.tar.gz nixpkgs-09930ec7d090cdffd0f66783c94c98c7f7529bfc.tar.bz2 nixpkgs-09930ec7d090cdffd0f66783c94c98c7f7529bfc.tar.lz nixpkgs-09930ec7d090cdffd0f66783c94c98c7f7529bfc.tar.xz nixpkgs-09930ec7d090cdffd0f66783c94c98c7f7529bfc.tar.zst nixpkgs-09930ec7d090cdffd0f66783c94c98c7f7529bfc.zip | |
Merge pull request #150138 from primeos/intel-gmmlib
intel-gmmlib: 21.3.3 -> 22.0.1, intel-media-driver: 21.4.3 -> 22.1.0
| -rw-r--r-- | pkgs/development/libraries/intel-gmmlib/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/intel-media-driver/default.nix | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/development/libraries/intel-gmmlib/default.nix b/pkgs/development/libraries/intel-gmmlib/default.nix index 59aaeb6ad92..644975ca66c 100644 --- a/pkgs/development/libraries/intel-gmmlib/default.nix +++ b/pkgs/development/libraries/intel-gmmlib/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "intel-gmmlib"; - version = "21.3.3"; + version = "22.0.1"; src = fetchFromGitHub { owner = "intel"; repo = "gmmlib"; rev = "intel-gmmlib-${version}"; - sha256 = "0hvly3fykhy4m7mzaa7xadaz7jz8krnfgj3zgzl2a2rpzja6frdn"; + sha256 = "1s46vwcs26hdlsa8h51gq4fyi9i8k5hrcx5ffbv9g7v3x706nplf"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/intel-media-driver/default.nix b/pkgs/development/libraries/intel-media-driver/default.nix index 689a70a320d..d76a58fc633 100644 --- a/pkgs/development/libraries/intel-media-driver/default.nix +++ b/pkgs/development/libraries/intel-media-driver/default.nix @@ -7,13 +7,14 @@ , libva , libpciaccess , intel-gmmlib +, libdrm , enableX11 ? stdenv.isLinux , libX11 }: stdenv.mkDerivation rec { pname = "intel-media-driver"; - version = "21.4.3"; + version = "22.1.0"; outputs = [ "out" "dev" ]; @@ -21,7 +22,7 @@ stdenv.mkDerivation rec { owner = "intel"; repo = "media-driver"; rev = "intel-media-${version}"; - sha256 = "04r03f48j1nly0j6aq8017va9m3yrnscv6lbrvf3a98fpwk9gc1l"; + sha256 = "0giba5274kzpjb5rp3d9bbnvcz7fp8ybi4s3hha2idxk0l5yamf1"; }; patches = [ @@ -43,7 +44,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ libva libpciaccess intel-gmmlib ] + buildInputs = [ libva libpciaccess intel-gmmlib libdrm ] ++ lib.optional enableX11 libX11; postFixup = lib.optionalString enableX11 '' |