diff options
author | K900 <me@0upti.me> | 2023-09-26 17:57:48 +0300 |
---|---|---|
committer | K900 <me@0upti.me> | 2023-09-26 18:02:00 +0300 |
commit | c018561f5467bdbcae1364220000d69431771d68 (patch) | |
tree | 3f5e031312ccce91f8061b3663b44f3d4bae1a70 | |
parent | 7a7c1859cdb11ba331a75b9a4888e36f5ef17aca (diff) | |
download | nixpkgs-c018561f5467bdbcae1364220000d69431771d68.tar nixpkgs-c018561f5467bdbcae1364220000d69431771d68.tar.gz nixpkgs-c018561f5467bdbcae1364220000d69431771d68.tar.bz2 nixpkgs-c018561f5467bdbcae1364220000d69431771d68.tar.lz nixpkgs-c018561f5467bdbcae1364220000d69431771d68.tar.xz nixpkgs-c018561f5467bdbcae1364220000d69431771d68.tar.zst nixpkgs-c018561f5467bdbcae1364220000d69431771d68.zip |
nixos/amdgpu-pro: remove `nixpkgs.config` usage
A new X.org ABI is exceptionally unlikely at this point, and we can add an assertion if it ever happens.
-rw-r--r-- | nixos/modules/hardware/video/amdgpu-pro.nix | 3 | ||||
-rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 31 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
3 files changed, 12 insertions, 23 deletions
diff --git a/nixos/modules/hardware/video/amdgpu-pro.nix b/nixos/modules/hardware/video/amdgpu-pro.nix index 299a30b0629..605aa6ef8b8 100644 --- a/nixos/modules/hardware/video/amdgpu-pro.nix +++ b/nixos/modules/hardware/video/amdgpu-pro.nix @@ -20,9 +20,6 @@ in { config = mkIf enabled { - - nixpkgs.config.xorg.abiCompat = "1.20"; - services.xserver.drivers = singleton { name = "amdgpu"; modules = [ package ]; display = true; }; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 2c168a659a8..a66cf9ce133 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -1,5 +1,4 @@ -{ abiCompat ? null, - callPackage, +{ callPackage, lib, stdenv, makeWrapper, fetchurl, fetchpatch, fetchFromGitLab, buildPackages, automake, autoconf, libiconv, libtool, intltool, gettext, python3, perl, freetype, tradcpp, fontconfig, meson, ninja, ed, fontforge, @@ -738,24 +737,18 @@ self: super: }); xorgserver = with xorg; super.xorgserver.overrideAttrs (attrs_passed: - # exchange attrs if abiCompat is set let - version = lib.getVersion attrs_passed; - attrs = - if (abiCompat == null || lib.hasPrefix abiCompat version) then - attrs_passed // { - buildInputs = attrs_passed.buildInputs ++ - lib.optional (libdrm != null) libdrm.dev; - postPatch = '' - for i in dri3/*.c - do - sed -i -e "s|#include <drm_fourcc.h>|#include <libdrm/drm_fourcc.h>|" $i - done - ''; - meta = attrs_passed.meta // { mainProgram = "X"; }; - } - else throw "unsupported xorg abiCompat ${abiCompat} for ${attrs_passed.name}"; - + attrs = attrs_passed // { + buildInputs = attrs_passed.buildInputs ++ + lib.optional (libdrm != null) libdrm.dev; + postPatch = '' + for i in dri3/*.c + do + sed -i -e "s|#include <drm_fourcc.h>|#include <libdrm/drm_fourcc.h>|" $i + done + ''; + meta = attrs_passed.meta // { mainProgram = "X"; }; + }; in attrs // (let version = lib.getVersion attrs; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ed7ae679b6c..7ab9c48ec12 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27692,7 +27692,6 @@ with pkgs; inherit (buildPackages.darwin) bootstrap_cmds; udev = if stdenv.isLinux then udev else null; libdrm = if stdenv.isLinux then libdrm else null; - abiCompat = config.xorg.abiCompat or null; # `config` because we have no `xorg.override` }; generatedPackages = lib.callPackageWith __splicedPackages ../servers/x11/xorg/default.nix { }; |