mirror of
				https://github.com/NixOS/nixos-hardware.git
				synced 2025-11-04 17:27:14 +08:00 
			
		
		
		
	gpu/amd: drop hardware.amdgpu.opencl option
This now conflicts with nixpkgs.
This commit is contained in:
		
				
					committed by
					
						
						mergify[bot]
					
				
			
			
				
	
			
			
			
						parent
						
							2f893e185c
						
					
				
				
					commit
					083823b790
				
			@@ -6,11 +6,6 @@
 | 
			
		||||
  ) // {
 | 
			
		||||
    default = true;
 | 
			
		||||
  };
 | 
			
		||||
  options.hardware.amdgpu.opencl = lib.mkEnableOption (lib.mdDoc
 | 
			
		||||
    "rocm opencl runtime (Install rocmPackages.clr and rocmPackages.clr.icd)"
 | 
			
		||||
  ) // {
 | 
			
		||||
    default = true;
 | 
			
		||||
  };
 | 
			
		||||
 | 
			
		||||
  config = lib.mkMerge [
 | 
			
		||||
    {
 | 
			
		||||
@@ -24,11 +19,5 @@
 | 
			
		||||
    (lib.mkIf config.hardware.amdgpu.loadInInitrd {
 | 
			
		||||
      boot.initrd.kernelModules = [ "amdgpu" ];
 | 
			
		||||
    })
 | 
			
		||||
    (lib.mkIf config.hardware.amdgpu.opencl {
 | 
			
		||||
      hardware.opengl.extraPackages =
 | 
			
		||||
        if pkgs ? rocmPackages.clr
 | 
			
		||||
        then with pkgs.rocmPackages; [ clr clr.icd ]
 | 
			
		||||
        else with pkgs; [ rocm-opencl-icd rocm-opencl-runtime ];
 | 
			
		||||
    })
 | 
			
		||||
  ];
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -1,4 +1,4 @@
 | 
			
		||||
{ ... }:
 | 
			
		||||
{ lib, options, ... }:
 | 
			
		||||
 | 
			
		||||
{
 | 
			
		||||
  imports = [ ../hybrid ];
 | 
			
		||||
@@ -12,6 +12,8 @@
 | 
			
		||||
  # of nix cannot implement such an operation as canceling an import.
 | 
			
		||||
  hardware = {
 | 
			
		||||
    nvidia.prime.offload.enable = false;
 | 
			
		||||
    amdgpu.opencl = false;
 | 
			
		||||
  } // lib.optionalAttrs (options ? amdgpu.opencl.enable) {
 | 
			
		||||
    # introduced in https://github.com/NixOS/nixpkgs/pull/319865
 | 
			
		||||
    amdgpu.opencl.enable = lib.mkDefault false;
 | 
			
		||||
  };
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -1,4 +1,4 @@
 | 
			
		||||
{ ... }:
 | 
			
		||||
{ lib, options, ... }:
 | 
			
		||||
 | 
			
		||||
{
 | 
			
		||||
  imports = [ ../hybrid ];
 | 
			
		||||
@@ -12,6 +12,8 @@
 | 
			
		||||
  # of nix cannot implement such an operation as canceling an import.
 | 
			
		||||
  hardware = {
 | 
			
		||||
    nvidia.prime.offload.enable = false;
 | 
			
		||||
    amdgpu.opencl = false;
 | 
			
		||||
  } // lib.optionalAttrs (options ? amdgpu.opencl.enable) {
 | 
			
		||||
    # introduced in https://github.com/NixOS/nixpkgs/pull/319865
 | 
			
		||||
    amdgpu.opencl.enable = lib.mkDefault false;
 | 
			
		||||
  };
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -1,10 +1,12 @@
 | 
			
		||||
{ ... }:
 | 
			
		||||
{ lib, options, ... }:
 | 
			
		||||
 | 
			
		||||
{
 | 
			
		||||
  imports = [ ../hybrid ];
 | 
			
		||||
  services.xserver.videoDrivers = [ "nvidia" ];
 | 
			
		||||
  hardware = {
 | 
			
		||||
    nvidia.prime.offload.enable = false;
 | 
			
		||||
    amdgpu.opencl = false;
 | 
			
		||||
  } // lib.optionalAttrs (options ? amdgpu.opencl.enable) {
 | 
			
		||||
    # introduced in https://github.com/NixOS/nixpkgs/pull/319865
 | 
			
		||||
    amdgpu.opencl.enable = lib.mkDefault false;
 | 
			
		||||
  };
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user