From 4cbb3cb26073aed0d548111901ba621ee517fedb Mon Sep 17 00:00:00 2001 From: Zhong Jianxin Date: Sun, 27 Oct 2024 20:58:00 +0800 Subject: [PATCH 1/4] intel-vaapi-driver: Format using nixfmt-rfc-style --- .../libraries/intel-vaapi-driver/default.nix | 55 +++++++++++++++---- 1 file changed, 43 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/intel-vaapi-driver/default.nix b/pkgs/development/libraries/intel-vaapi-driver/default.nix index 9f9e2f2bbd40..19135ed2692e 100644 --- a/pkgs/development/libraries/intel-vaapi-driver/default.nix +++ b/pkgs/development/libraries/intel-vaapi-driver/default.nix @@ -1,8 +1,22 @@ -{ lib, stdenv, fetchFromGitHub -, autoreconfHook, gnum4, pkg-config, python3, wayland-scanner -, intel-gpu-tools, libdrm, libva, libX11, libGL, wayland, libXext -, enableHybridCodec ? false, vaapi-intel-hybrid -, enableGui ? true +{ + lib, + stdenv, + fetchFromGitHub, + autoreconfHook, + gnum4, + pkg-config, + python3, + wayland-scanner, + intel-gpu-tools, + libdrm, + libva, + libX11, + libGL, + wayland, + libXext, + enableHybridCodec ? false, + vaapi-intel-hybrid, + enableGui ? true, }: stdenv.mkDerivation rec { @@ -10,9 +24,9 @@ stdenv.mkDerivation rec { version = "2.4.1"; src = fetchFromGitHub { - owner = "intel"; - repo = "intel-vaapi-driver"; - rev = version; + owner = "intel"; + repo = "intel-vaapi-driver"; + rev = version; sha256 = "1cidki3av9wnkgwi7fklxbg3bh6kysf8w3fk2qadjr05a92mx3zp"; }; @@ -29,11 +43,25 @@ stdenv.mkDerivation rec { ] ++ lib.optional enableHybridCodec "--enable-hybrid-codec"; nativeBuildInputs = [ - autoreconfHook gnum4 pkg-config python3 wayland-scanner + autoreconfHook + gnum4 + pkg-config + python3 + wayland-scanner ]; - buildInputs = [ intel-gpu-tools libdrm libva ] - ++ lib.optionals enableGui [ libX11 libXext libGL wayland ] + buildInputs = + [ + intel-gpu-tools + libdrm + libva + ] + ++ lib.optionals enableGui [ + libX11 + libXext + libGL + wayland + ] ++ lib.optional enableHybridCodec vaapi-intel-hybrid; enableParallelBuilding = true; @@ -52,7 +80,10 @@ stdenv.mkDerivation rec { processing. It consists of a main library and driver-specific acceleration backends for each supported hardware vendor. ''; - platforms = [ "x86_64-linux" "i686-linux" ]; + platforms = [ + "x86_64-linux" + "i686-linux" + ]; maintainers = with maintainers; [ SuperSandro2000 ]; }; } From b657bae709c80552f6fb343d2232bcea8d88dd6e Mon Sep 17 00:00:00 2001 From: Zhong Jianxin Date: Sun, 27 Oct 2024 20:59:12 +0800 Subject: [PATCH 2/4] intel-vaapi-driver: Move to pkgs/by-name --- .../default.nix => by-name/in/intel-vaapi-driver/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{development/libraries/intel-vaapi-driver/default.nix => by-name/in/intel-vaapi-driver/package.nix} (100%) diff --git a/pkgs/development/libraries/intel-vaapi-driver/default.nix b/pkgs/by-name/in/intel-vaapi-driver/package.nix similarity index 100% rename from pkgs/development/libraries/intel-vaapi-driver/default.nix rename to pkgs/by-name/in/intel-vaapi-driver/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3ad27f060e63..ed277412c0a4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23279,8 +23279,6 @@ with pkgs; stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; }; - intel-vaapi-driver = callPackage ../development/libraries/intel-vaapi-driver { }; - vaapi-intel-hybrid = callPackage ../development/libraries/vaapi-intel-hybrid { }; libva-vdpau-driver = callPackage ../development/libraries/libva-vdpau-driver { }; From 410f5d583eb826f98a295f4df9806cf7a5f18eb2 Mon Sep 17 00:00:00 2001 From: Zhong Jianxin Date: Sun, 27 Oct 2024 21:08:14 +0800 Subject: [PATCH 3/4] intel-vaapi-driver: 2.4.1 -> 2.4.1-unstable-2024-10-27 Fix hwdec with libva 2.22, see https://github.com/intel/intel-vaapi-driver/pull/566 It seems upstream will [no longer create new releases][1], use unstable version for now. [1]: https://github.com/intel/intel-vaapi-driver/pull/569 --- pkgs/by-name/in/intel-vaapi-driver/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/in/intel-vaapi-driver/package.nix b/pkgs/by-name/in/intel-vaapi-driver/package.nix index 19135ed2692e..21a7f06f5f45 100644 --- a/pkgs/by-name/in/intel-vaapi-driver/package.nix +++ b/pkgs/by-name/in/intel-vaapi-driver/package.nix @@ -19,15 +19,15 @@ enableGui ? true, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "intel-vaapi-driver"; - version = "2.4.1"; + version = "2.4.1-unstable-2024-10-27"; src = fetchFromGitHub { owner = "intel"; repo = "intel-vaapi-driver"; - rev = version; - sha256 = "1cidki3av9wnkgwi7fklxbg3bh6kysf8w3fk2qadjr05a92mx3zp"; + rev = "d30e01329344858f3c84d0ef9c2b68cbde37bb9a"; + hash = "sha256-hMXFLXXTe2qvdk8svVlJ0sWJUIv8lu5DXk53SlBO0Cg="; }; # Set the correct install path: From 00269b87c3c1722e1baa6275a3488a778b9dd82b Mon Sep 17 00:00:00 2001 From: Zhong Jianxin Date: Sun, 27 Oct 2024 21:19:21 +0800 Subject: [PATCH 4/4] intel-vaapi-driver: Add passthru.updateScript --- pkgs/by-name/in/intel-vaapi-driver/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/in/intel-vaapi-driver/package.nix b/pkgs/by-name/in/intel-vaapi-driver/package.nix index 21a7f06f5f45..bc008a3de1ca 100644 --- a/pkgs/by-name/in/intel-vaapi-driver/package.nix +++ b/pkgs/by-name/in/intel-vaapi-driver/package.nix @@ -17,6 +17,7 @@ enableHybridCodec ? false, vaapi-intel-hybrid, enableGui ? true, + nix-update-script, }: stdenv.mkDerivation { @@ -66,6 +67,8 @@ stdenv.mkDerivation { enableParallelBuilding = true; + passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; + meta = with lib; { homepage = "https://01.org/linuxmedia"; license = licenses.mit;