Skip to content

Commit

Permalink
linuxPackages.amdgpu-pro: use libffi_3_3, not an override
Browse files Browse the repository at this point in the history
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: NixOS#279955
  • Loading branch information
trofi committed Jan 10, 2024
1 parent 9c4e129 commit b606357
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 11 deletions.
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/amdgpu-pro/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
, perl
, zlib
, expat
, libffi
, libffi_3_3
, libselinux
, libdrm
, udev
Expand Down Expand Up @@ -119,7 +119,7 @@ in stdenv.mkDerivation rec {
libxshmfence
elfutils
expat
libffi
libffi_3_3
libselinux
# libudev is not listed in any dependencies, but is loaded dynamically
udev
Expand Down
10 changes: 1 addition & 9 deletions pkgs/top-level/linux-kernels.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 { };

Expand Down

0 comments on commit b606357

Please sign in to comment.