commit a0201020e257d19cc716ddb3ce0891e39d64ed34 · pyrox.dev/nixpkgs

+2 -29

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

···

       91
       91
        
       different GPUs. In NixOS, there are two ways to make ICD files visible

     

       92
       92
        
       to Vulkan applications: an environment variable and a module option.

     

       93
       93
        
       

     

       94
       94
       -
       The first option is through the `VK_ICD_FILENAMES` environment variable.

     

       95
       95
       -
       This variable can contain multiple JSON files, separated by `:`. For

     

       96
       96
       -
       example:

     

       97
       97
       -
       

     

       98
       98
       -
       ```ShellSession

     

       99
       99
       -
       $ export \

     

       100
       100
       -
         VK_ICD_FILENAMES=`nix-build '<nixpkgs>' --no-out-link -A amdvlk`/share/vulkan/icd.d/amd_icd64.json

     

       101
       101
       -
       ```

     

       102
       102
       -
       

     

       103
       103
       -
       The second mechanism is to add the Vulkan driver package to

     

       94
       94
       +
       The way to do this is to add the Vulkan driver package to

     

       104
       95
        
       [](#opt-hardware.graphics.extraPackages).

     

       105
       96
        
       This links the ICD file under `/run/opengl-driver`, where it will be

     

       106
       97
        
       visible to the ICD loader.

     
···

       129
       120
        
       

     

       130
       121
        
       Modern AMD [Graphics Core

     

       131
       122
        
       Next](https://en.wikipedia.org/wiki/Graphics_Core_Next) (GCN) GPUs are

     

       132
       132
       -
       supported through either radv, which is part of mesa, or the amdvlk

     

       133
       133
       -
       package. Adding the amdvlk package to

     

       134
       134
       -
       [](#opt-hardware.graphics.extraPackages)

     

       135
       135
       -
       makes amdvlk the default driver and hides radv and lavapipe from the device list.

     

       136
       136
       -
       A specific driver can be forced as follows:

     

       137
       137
       -
       

     

       138
       138
       -
       ```nix

     

       139
       139
       -
       {

     

       140
       140
       -
         hardware.graphics.extraPackages = [ pkgs.amdvlk ];

     

       141
       141
       -
       

     

       142
       142
       -
         # To enable Vulkan support for 32-bit applications, also add:

     

       143
       143
       -
         hardware.graphics.extraPackages32 = [ pkgs.driversi686Linux.amdvlk ];

     

       144
       144
       -
       

     

       145
       145
       -
         # Force radv

     

       146
       146
       -
         environment.variables.AMD_VULKAN_ICD = "RADV";

     

       147
       147
       -
         # Or

     

       148
       148
       -
         environment.variables.VK_ICD_FILENAMES = "/run/opengl-driver/share/vulkan/icd.d/radeon_icd.x86_64.json";

     

       149
       149
       -
       }

     

       150
       150
       -
       ```

     

       123
       123
       +
       supported through the RADV driver, which is part of mesa.

     

       151
       124
        
       

     

       152
       125
        
       ## VA-API {#sec-gpu-accel-va-api}

     

       153
       126

+1 -1

nixos/doc/manual/release-notes/rl-2411.section.md

···

       29
       29
        
       

     

       30
       30
        
       - Convenience options for `amdgpu`, the open source driver for Radeon cards, are now available under [`hardware.amdgpu`](#opt-hardware.amdgpu.initrd.enable).

     

       31
       31
        
       

     

       32
       32
       -
       - [AMDVLK](https://github.com/GPUOpen-Drivers/AMDVLK), AMD's open source Vulkan driver, is now available to be configured under the [`hardware.amdgpu.amdvlk`](#opt-hardware.amdgpu.amdvlk.enable) option.

     

       32
       32
       +
       - [AMDVLK](https://github.com/GPUOpen-Drivers/AMDVLK), AMD's open source Vulkan driver, is now available to be configured under the {option}`hardware.amdgpu.amdvlk` option.

     

       33
       33
        
         This also allows configuring runtime settings for AMDVLK, including enabling experimental features.

     

       34
       34
        
       

     

       35
       35
        
       - The `moonlight-qt` package (for [Moonlight game streaming](https://moonlight-stream.org/)) now has HDR support on Linux systems.

nixos/doc/manual/release-notes/rl-2511.section.md

···

       150
       150
        
       

     

       151
       151
        
       - The `no-broken-symlink` build hook now also fails builds whose output derivation contains links to $TMPDIR (typically /build, which contains the build directory).

     

       152
       152
        
       

     

       153
       153
       +
       - `hardware.amdgpu.amdvlk` and the `amdvlk` package have been removed, as they have been deprecated by AMD. These have been replaced with the RADV driver from Mesa, which is enabled by default.

     

       154
       154
       +
       

     

       153
       155
        
       - The `services.polipo` module has been removed as `polipo` is unmaintained and archived upstream.

     

       154
       156
        
       

     

       155
       157
        
       - `virtualisation.lxd` has been removed due to lack of Nixpkgs maintenance. Users can migrate to `virtualisation.incus`, a fork of LXD, as a replacement. See [Incus migration documentation](https://linuxcontainers.org/incus/docs/main/howto/server_migrate_lxd/) for migration information.

-1

nixos/modules/module-list.nix

···

       631
       631
        
         ./services/hardware/acpid.nix

     

       632
       632
        
         ./services/hardware/actkbd.nix

     

       633
       633
        
         ./services/hardware/amdgpu.nix

     

       634
       634
       -
         ./services/hardware/amdvlk.nix

     

       635
       634
        
         ./services/hardware/argonone.nix

     

       636
       635
        
         ./services/hardware/asusd.nix

     

       637
       636
        
         ./services/hardware/auto-cpufreq.nix

nixos/modules/rename.nix

···

       34
       34
        
             "fontconfig"

     

       35
       35
        
             "penultimate"

     

       36
       36
        
           ] "The corresponding package has removed from nixpkgs.")

     

       37
       37
       +
           (mkRemovedOptionModule [

     

       38
       38
       +
             "hardware"

     

       39
       39
       +
             "amdgpu"

     

       40
       40
       +
             "amdvlk"

     

       41
       41
       +
           ] "'amdvlk' has been removed. The replacement driver RADV, part of Mesa, is enabled by default.")

     

       37
       42
        
           (mkRemovedOptionModule [ "hardware" "brightnessctl" ] ''

     

       38
       43
        
             The brightnessctl module was removed because newer versions of

     

       39
       44
        
             brightnessctl don't require the udev rules anymore (they can use the

-1

nixos/modules/services/hardware/amdgpu.nix

···

       40
       40
        
           };

     

       41
       41
        
       

     

       42
       42
        
           opencl.enable = lib.mkEnableOption ''OpenCL support using ROCM runtime library'';

     

       43
       43
       -
           # cfg.amdvlk option is defined in ./amdvlk.nix module

     

       44
       43
        
         };

     

       45
       44
        
       

     

       46
       45
        
         config = {

-65

nixos/modules/services/hardware/amdvlk.nix

···

       1
       1
       -
       {

     

       2
       2
       -
         config,

     

       3
       3
       -
         lib,

     

       4
       4
       -
         pkgs,

     

       5
       5
       -
         ...

     

       6
       6
       -
       }:

     

       7
       7
       -
       

     

       8
       8
       -
       let

     

       9
       9
       -
         cfg = config.hardware.amdgpu.amdvlk;

     

       10
       10
       -
       in

     

       11
       11
       -
       {

     

       12
       12
       -
         options.hardware.amdgpu.amdvlk = {

     

       13
       13
       -
           enable = lib.mkEnableOption "AMDVLK Vulkan driver";

     

       14
       14
       -
       

     

       15
       15
       -
           package = lib.mkPackageOption pkgs "amdvlk" { };

     

       16
       16
       -
       

     

       17
       17
       -
           supportExperimental.enable = lib.mkEnableOption "Experimental features support";

     

       18
       18
       -
       

     

       19
       19
       -
           support32Bit.enable = lib.mkEnableOption "32-bit driver support";

     

       20
       20
       -
           support32Bit.package = lib.mkPackageOption pkgs [ "driversi686Linux" "amdvlk" ] { };

     

       21
       21
       -
       

     

       22
       22
       -
           settings = lib.mkOption {

     

       23
       23
       -
             type = with lib.types; attrsOf (either str int);

     

       24
       24
       -
             default = { };

     

       25
       25
       -
             example = {

     

       26
       26
       -
               AllowVkPipelineCachingToDisk = 1;

     

       27
       27
       -
               ShaderCacheMode = 1;

     

       28
       28
       -
               IFH = 0;

     

       29
       29
       -
               EnableVmAlwaysValid = 1;

     

       30
       30
       -
               IdleAfterSubmitGpuMask = 1;

     

       31
       31
       -
             };

     

       32
       32
       -
             description = ''

     

       33
       33
       -
               Runtime settings for AMDVLK to be configured {file}`/etc/amd/amdVulkanSettings.cfg`.

     

       34
       34
       -
               See [AMDVLK GitHub page](https://github.com/GPUOpen-Drivers/AMDVLK?tab=readme-ov-file#runtime-settings).

     

       35
       35
       -
             '';

     

       36
       36
       -
           };

     

       37
       37
       -
         };

     

       38
       38
       -
       

     

       39
       39
       -
         config = lib.mkIf cfg.enable {

     

       40
       40
       -
           hardware.graphics = {

     

       41
       41
       -
             enable = true;

     

       42
       42
       -
             extraPackages = [ cfg.package ];

     

       43
       43
       -
           }

     

       44
       44
       -
           // lib.optionalAttrs cfg.support32Bit.enable {

     

       45
       45
       -
             enable32Bit = true;

     

       46
       46
       -
             extraPackages32 = [ cfg.support32Bit.package ];

     

       47
       47
       -
           };

     

       48
       48
       -
       

     

       49
       49
       -
           environment.sessionVariables = lib.mkIf cfg.supportExperimental.enable {

     

       50
       50
       -
             AMDVLK_ENABLE_DEVELOPING_EXT = "all";

     

       51
       51
       -
           };

     

       52
       52
       -
       

     

       53
       53
       -
           environment.etc = lib.mkIf (cfg.settings != { }) {

     

       54
       54
       -
             "amd/amdVulkanSettings.cfg".text = lib.concatStrings (

     

       55
       55
       -
               lib.mapAttrsToList (n: v: ''

     

       56
       56
       -
                 ${n},${builtins.toString v}

     

       57
       57
       -
               '') cfg.settings

     

       58
       58
       -
             );

     

       59
       59
       -
           };

     

       60
       60
       -
         };

     

       61
       61
       -
       

     

       62
       62
       -
         meta = {

     

       63
       63
       -
           maintainers = with lib.maintainers; [ johnrtitor ];

     

       64
       64
       -
         };

     

       65
       65
       -
       }

-141

pkgs/by-name/am/amdvlk/package.nix

···

       1
       1
       -
       {

     

       2
       2
       -
         stdenv,

     

       3
       3
       -
         callPackage,

     

       4
       4
       -
         lib,

     

       5
       5
       -
         fetchRepoProject,

     

       6
       6
       -
         nix-update-script,

     

       7
       7
       -
         cmake,

     

       8
       8
       -
         directx-shader-compiler,

     

       9
       9
       -
         glslang,

     

       10
       10
       -
         ninja,

     

       11
       11
       -
         patchelf,

     

       12
       12
       -
         perl,

     

       13
       13
       -
         pkg-config,

     

       14
       14
       -
         python3,

     

       15
       15
       -
         expat,

     

       16
       16
       -
         libdrm,

     

       17
       17
       -
         ncurses,

     

       18
       18
       -
         openssl,

     

       19
       19
       -
         wayland,

     

       20
       20
       -
         xorg,

     

       21
       21
       -
         zlib,

     

       22
       22
       -
       }:

     

       23
       23
       -
       let

     

       24
       24
       -
       

     

       25
       25
       -
         suffix = if stdenv.system == "x86_64-linux" then "64" else "32";

     

       26
       26
       -
       

     

       27
       27
       -
       in

     

       28
       28
       -
       stdenv.mkDerivation (finalAttrs: {

     

       29
       29
       -
         pname = "amdvlk";

     

       30
       30
       -
         version = "2025.Q1.3";

     

       31
       31
       -
       

     

       32
       32
       -
         src = fetchRepoProject {

     

       33
       33
       -
           name = "amdvlk-src";

     

       34
       34
       -
           manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git";

     

       35
       35
       -
           rev = "refs/tags/v-${finalAttrs.version}";

     

       36
       36
       -
           hash = "sha256-ZXou5g0emeK++NyV/hQllZAdZAMEY9TYs9c+umFdcfo=";

     

       37
       37
       -
         };

     

       38
       38
       -
       

     

       39
       39
       -
         buildInputs = [

     

       40
       40
       -
           expat

     

       41
       41
       -
           libdrm

     

       42
       42
       -
           ncurses

     

       43
       43
       -
           openssl

     

       44
       44
       -
           wayland

     

       45
       45
       -
           zlib

     

       46
       46
       -
         ]

     

       47
       47
       -
         ++ (with xorg; [

     

       48
       48
       -
           libX11

     

       49
       49
       -
           libxcb

     

       50
       50
       -
           xcbproto

     

       51
       51
       -
           libXext

     

       52
       52
       -
           libXrandr

     

       53
       53
       -
           libXft

     

       54
       54
       -
           libxshmfence

     

       55
       55
       -
         ]);

     

       56
       56
       -
       

     

       57
       57
       -
         nativeBuildInputs = [

     

       58
       58
       -
           cmake

     

       59
       59
       -
           directx-shader-compiler

     

       60
       60
       -
           glslang

     

       61
       61
       -
           ninja

     

       62
       62
       -
           patchelf

     

       63
       63
       -
           perl

     

       64
       64
       -
           pkg-config

     

       65
       65
       -
           python3

     

       66
       66
       -
         ]

     

       67
       67
       -
         ++ (with python3.pkgs; [

     

       68
       68
       -
           jinja2

     

       69
       69
       -
           ruamel-yaml

     

       70
       70
       -
         ]);

     

       71
       71
       -
       

     

       72
       72
       -
         rpath = lib.makeLibraryPath (

     

       73
       73
       -
           [

     

       74
       74
       -
             libdrm

     

       75
       75
       -
             openssl

     

       76
       76
       -
             stdenv.cc.cc

     

       77
       77
       -
             zlib

     

       78
       78
       -
           ]

     

       79
       79
       -
           ++ (with xorg; [

     

       80
       80
       -
             libX11

     

       81
       81
       -
             libxcb

     

       82
       82
       -
             libxshmfence

     

       83
       83
       -
           ])

     

       84
       84
       -
         );

     

       85
       85
       -
       

     

       86
       86
       -
         cmakeDir = "../drivers/xgl";

     

       87
       87
       -
       

     

       88
       88
       -
         cmakeFlags = [

     

       89
       89
       -
           # There is some incredibly cursed issue with

     

       90
       90
       -
           # `directx-shader-compiler` flagging up compiler errors only on

     

       91
       91
       -
           # `i686-linux` and only when it has been compiled with a recent

     

       92
       92
       -
           # GCC. Since few 32‐bit games are going to use ray tracing anyway,

     

       93
       93
       -
           # we just disable it for now. Arch has done this since 2022.

     

       94
       94
       -
           #

     

       95
       95
       -
           # See:

     

       96
       96
       -
           # * <https://github.com/NixOS/nixpkgs/issues/216294>

     

       97
       97
       -
           # * <https://github.com/GPUOpen-Drivers/gpurt/issues/5>

     

       98
       98
       -
           # * <https://gitlab.archlinux.org/archlinux/packaging/packages/lib32-amdvlk/-/commit/905d9bc2cf4a003b3d367537b5e120d9771cce16>

     

       99
       99
       -
           (lib.cmakeBool "VKI_RAY_TRACING" (!(stdenv.hostPlatform.isx86 && stdenv.hostPlatform.is32bit)))

     

       100
       100
       -
         ];

     

       101
       101
       -
       

     

       102
       102
       -
         installPhase = ''

     

       103
       103
       -
           runHook preInstall

     

       104
       104
       -
       

     

       105
       105
       -
           install -Dm755 -t $out/lib icd/amdvlk${suffix}.so

     

       106
       106
       -
           install -Dm644 -t $out/share/vulkan/icd.d icd/amd_icd${suffix}.json

     

       107
       107
       -
           install -Dm644 -t $out/share/vulkan/implicit_layer.d icd/amd_icd${suffix}.json

     

       108
       108
       -
       

     

       109
       109
       -
           patchelf --set-rpath "$rpath" $out/lib/amdvlk${suffix}.so

     

       110
       110
       -
       

     

       111
       111
       -
           runHook postInstall

     

       112
       112
       -
         '';

     

       113
       113
       -
       

     

       114
       114
       -
         # Keep the rpath, otherwise vulkaninfo and vkcube segfault

     

       115
       115
       -
         dontPatchELF = true;

     

       116
       116
       -
       

     

       117
       117
       -
         passthru.updateScript = nix-update-script {

     

       118
       118
       -
           extraArgs = [

     

       119
       119
       -
             "--url"

     

       120
       120
       -
             "https://github.com/GPUOpen-Drivers/AMDVLK"

     

       121
       121
       -
             "--version-regex"

     

       122
       122
       -
             "v-(.*)"

     

       123
       123
       -
           ];

     

       124
       124
       -
         };

     

       125
       125
       -
       

     

       126
       126
       -
         passthru.impureTests = {

     

       127
       127
       -
           amdvlk = callPackage ./test.nix { };

     

       128
       128
       -
         };

     

       129
       129
       -
       

     

       130
       130
       -
         meta = {

     

       131
       131
       -
           description = "AMD Open Source Driver For Vulkan";

     

       132
       132
       -
           homepage = "https://github.com/GPUOpen-Drivers/AMDVLK";

     

       133
       133
       -
           changelog = "https://github.com/GPUOpen-Drivers/AMDVLK/releases/tag/v-${finalAttrs.version}";

     

       134
       134
       -
           license = lib.licenses.mit;

     

       135
       135
       -
           platforms = [

     

       136
       136
       -
             "x86_64-linux"

     

       137
       137
       -
             "i686-linux"

     

       138
       138
       -
           ];

     

       139
       139
       -
           maintainers = with lib.maintainers; [ Flakebi ];

     

       140
       140
       -
         };

     

       141
       141
       -
       })

-58

pkgs/by-name/am/amdvlk/test.nix

···

       1
       1
       -
       {

     

       2
       2
       -
         lib,

     

       3
       3
       -
         makeImpureTest,

     

       4
       4
       -
         coreutils,

     

       5
       5
       -
         amdvlk,

     

       6
       6
       -
         vulkan-tools,

     

       7
       7
       -
       }:

     

       8
       8
       -
       makeImpureTest {

     

       9
       9
       -
         name = "amdvlk";

     

       10
       10
       -
         testedPackage = "amdvlk";

     

       11
       11
       -
       

     

       12
       12
       -
         sandboxPaths = [

     

       13
       13
       -
           "/sys"

     

       14
       14
       -
           "/dev/dri"

     

       15
       15
       -
         ];

     

       16
       16
       -
       

     

       17
       17
       -
         nativeBuildInputs = [ vulkan-tools ];

     

       18
       18
       -
       

     

       19
       19
       -
         VK_ICD_FILENAMES = "${amdvlk}/share/vulkan/icd.d/amd_icd64.json";

     

       20
       20
       -
         XDG_RUNTIME_DIR = "/tmp";

     

       21
       21
       -
       

     

       22
       22
       -
         # AMDVLK needs access to /dev/dri/card0 (or another card), but normally it is rw-rw----

     

       23
       23
       -
         # Change the permissions to be rw for everyone

     

       24
       24
       -
         prepareRunCommands = ''

     

       25
       25
       -
           function reset_perms()

     

       26
       26
       -
           {

     

       27
       27
       -
             # Reset permissions to previous state

     

       28
       28
       -
             for card in /dev/dri/card*; do

     

       29
       29
       -
               sudo ${coreutils}/bin/chmod "0''${cardPerms[$card]}" $card

     

       30
       30
       -
             done

     

       31
       31
       -
           }

     

       32
       32
       -
       

     

       33
       33
       -
           # Save permissions on /dev/dri/card*

     

       34
       34
       -
           declare -A cardPerms

     

       35
       35
       -
           for card in /dev/dri/card*; do

     

       36
       36
       -
             cardPerms[$card]=$(stat -c "%a" $card)

     

       37
       37
       -
           done

     

       38
       38
       -
       

     

       39
       39
       -
           sudo ${coreutils}/bin/chmod o+rw /dev/dri/card*

     

       40
       40
       -
           trap reset_perms EXIT

     

       41
       41
       -
         '';

     

       42
       42
       -
       

     

       43
       43
       -
         testScript = ''

     

       44
       44
       -
           # Check that there is at least one card with write-access

     

       45
       45
       -
           if ! ls -l /dev/dri/card* | cut -b8-9 | grep -q rw; then

     

       46
       46
       -
             echo 'AMDVLK needs rw access to /dev/dri/card0 or a fitting card, please run `sudo chmod o+rw /dev/dri/card*`'

     

       47
       47
       -
             exit 1

     

       48
       48
       -
           fi

     

       49
       49
       -
       

     

       50
       50
       -
           vulkaninfo --summary

     

       51
       51
       -
           echo "Checking version"

     

       52
       52
       -
           vulkaninfo --summary | grep '= ${amdvlk.version}'

     

       53
       53
       -
         '';

     

       54
       54
       -
       

     

       55
       55
       -
         meta = with lib.maintainers; {

     

       56
       56
       -
           maintainers = [ Flakebi ];

     

       57
       57
       -
         };

     

       58
       58
       -
       }

pkgs/top-level/aliases.nix

···

       431
       431
        
         alsaTools = throw "'alsaTools' has been renamed to/replaced by 'alsa-tools'"; # Converted to throw 2024-10-17

     

       432
       432
        
         alsaUtils = throw "'alsaUtils' has been renamed to/replaced by 'alsa-utils'"; # Converted to throw 2024-10-17

     

       433
       433
        
         amazon-qldb-shell = throw "'amazon-qldb-shell' has been removed due to being unmaintained upstream"; # Added 2025-07-30

     

       434
       434
       +
         amdvlk = throw "'amdvlk' has been removed since it was deprecated by AMD. Its replacement, RADV, is enabled by default."; # Added 2025-09-20

     

       434
       435
        
         angelfish = throw "'angelfish' has been renamed to/replaced by 'libsForQt5.kdeGear.angelfish'"; # Converted to throw 2024-10-17

     

       435
       436
        
         animeko = throw "'animeko' has been removed since it is unmaintained"; # Added 2025-08-20

     

       436
       437
        
         ansible_2_14 = throw "Ansible 2.14 goes end of life in 2024/05 and can't be supported throughout the 24.05 release cycle"; # Added 2024-04-11

-1

pkgs/top-level/all-packages.nix

···

       7302
       7302
        
         # Multi-arch "drivers" which we want to build for i686.

     

       7303
       7303
        
         driversi686Linux = recurseIntoAttrs {

     

       7304
       7304
        
           inherit (pkgsi686Linux)

     

       7305
       7305
       -
             amdvlk

     

       7306
       7305
        
             intel-media-driver

     

       7307
       7306
        
             intel-vaapi-driver

     

       7308
       7307
        
             mesa