about summary refs log tree commit diff
path: root/pkgs/top-level/linux-kernels.nix
diff options
context:
space:
mode:
authorSergei Trofimovich <slyich@gmail.com>2024-01-10 09:38:04 +0000
committerSergei Trofimovich <slyich@gmail.com>2024-01-10 09:40:12 +0000
commitb6063571b1ae94e4bcf20b51d900378627310ee2 (patch)
tree102a12689a01ab81e84d177a0b950e33cda11107 /pkgs/top-level/linux-kernels.nix
parent9c4e12996355e395a71d761e43162b847a2f17cd (diff)
downloadnixlib-b6063571b1ae94e4bcf20b51d900378627310ee2.tar
nixlib-b6063571b1ae94e4bcf20b51d900378627310ee2.tar.gz
nixlib-b6063571b1ae94e4bcf20b51d900378627310ee2.tar.bz2
nixlib-b6063571b1ae94e4bcf20b51d900378627310ee2.tar.lz
nixlib-b6063571b1ae94e4bcf20b51d900378627310ee2.tar.xz
nixlib-b6063571b1ae94e4bcf20b51d900378627310ee2.tar.zst
nixlib-b6063571b1ae94e4bcf20b51d900378627310ee2.zip
linuxPackages.amdgpu-pro: use `libffi_3_3`, not an override
Without the change `amdgpu-pro` tried to build `libffi-3.3` with patches
for `libffi-3.4` and failed as:

    patching file include/ffi_common.h
    Hunk #1 succeeded at 103 with fuzz 2 (offset -25 lines).
    can't find file to patch at input line 36

THe change uses `libffi_3_3` instead.

Closes: https://github.com/NixOS/nixpkgs/issues/279955
Diffstat (limited to 'pkgs/top-level/linux-kernels.nix')
-rw-r--r--pkgs/top-level/linux-kernels.nix10
1 files changed, 1 insertions, 9 deletions
diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix
index 92e527c735a8..dc71b01f3c26 100644
--- a/pkgs/top-level/linux-kernels.nix
+++ b/pkgs/top-level/linux-kernels.nix
@@ -298,15 +298,7 @@ in {
 
     akvcam = callPackage ../os-specific/linux/akvcam { };
 
-    amdgpu-pro = callPackage ../os-specific/linux/amdgpu-pro {
-      libffi = pkgs.libffi.overrideAttrs (orig: rec {
-        version = "3.3";
-        src = fetchurl {
-          url = "https://github.com/libffi/libffi/releases/download/v${version}/${orig.pname}-${version}.tar.gz";
-          sha256 = "0mi0cpf8aa40ljjmzxb7im6dbj45bb0kllcd09xgmp834y9agyvj";
-        };
-      });
-    };
+    amdgpu-pro = callPackage ../os-specific/linux/amdgpu-pro { };
 
     apfs = callPackage ../os-specific/linux/apfs { };