Unverified Commit fdb8f499 authored by Sandro Jäckel's avatar Sandro Jäckel
Browse files

vaapiIntel: rename to intel-vaapi-driver 

I tripped over this way to often and a package attr matching the pname
is way nicer, anyway.
parent b4da951e

nixos/doc/manual/configuration/gpu-accel.chapter.md

+1 −1
Original line number Diff line number Diff line
@@ -189,7 +189,7 @@ Older Intel GPUs use the i965 driver, which can be installed with: 


```nix

hardware.opengl.extraPackages = [

  vaapiIntel

  intel-vaapi-driver

];

```

nixos/modules/hardware/opengl.nix

+4 −4
Original line number Diff line number Diff line
@@ -87,13 +87,13 @@ in 
      extraPackages = mkOption {

        type = types.listOf types.package;

        default = [];

        example = literalExpression "with pkgs; [ intel-media-driver intel-ocl vaapiIntel ]";

        example = literalExpression "with pkgs; [ intel-media-driver intel-ocl intel-vaapi-driver ]";

        description = lib.mdDoc ''

          Additional packages to add to OpenGL drivers.

          This can be used to add OpenCL drivers, VA-API/VDPAU drivers etc.



          ::: {.note}

          intel-media-driver supports hardware Broadwell (2014) or newer. Older hardware should use the mostly unmaintained vaapiIntel driver.

          intel-media-driver supports hardware Broadwell (2014) or newer. Older hardware should use the mostly unmaintained intel-vaapi-driver driver.

          :::

        '';

      };
@@ -101,13 +101,13 @@ in 
      extraPackages32 = mkOption {

        type = types.listOf types.package;

        default = [];

        example = literalExpression "with pkgs.pkgsi686Linux; [ intel-media-driver vaapiIntel ]";

        example = literalExpression "with pkgs.pkgsi686Linux; [ intel-media-driver intel-vaapi-driver ]";

        description = lib.mdDoc ''

          Additional packages to add to 32-bit OpenGL drivers on 64-bit systems.

          Used when {option}`driSupport32Bit` is set. This can be used to add OpenCL drivers, VA-API/VDPAU drivers etc.



          ::: {.note}

          intel-media-driver supports hardware Broadwell (2014) or newer. Older hardware should use the mostly unmaintained vaapiIntel driver.

          intel-media-driver supports hardware Broadwell (2014) or newer. Older hardware should use the mostly unmaintained intel-vaapi-driver driver.

          :::

        '';

      };

pkgs/development/libraries/libva/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
, intel-compute-runtime

, intel-media-driver

, mpv

, vaapiIntel

, intel-vaapi-driver

, vlc

}:
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec { 
  passthru.tests = {

    # other drivers depending on libva and selected application users.

    # Please get a confirmation from the maintainer before adding more applications.

    inherit intel-compute-runtime intel-media-driver vaapiIntel mpv vlc;

    inherit intel-compute-runtime intel-media-driver intel-vaapi-driver mpv vlc;

  };



  meta = with lib; {

pkgs/top-level/aliases.nix

+1 −0
Original line number Diff line number Diff line
@@ -1712,6 +1712,7 @@ mapAliases ({ 


  v4l_utils = v4l-utils; # Added 2019-08-07

  vamp = { vampSDK = vamp-plugin-sdk; }; # Added 2020-03-26

  vaapiIntel = intel-vaapi-driver; # Added 2023-05-31

  vapor = throw "vapor was removed because it was unmaintained and upstream service no longer exists";

  varnish62 = throw "varnish62 was removed from nixpkgs, because it is unmaintained upstream. Please switch to a different release"; # Added 2021-07-26

  varnish63 = throw "varnish63 was removed from nixpkgs, because it is unmaintained upstream. Please switch to a different release"; # Added 2021-07-26