cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

linuxPackages.amdgpu-pro: use libffi_3_3, not an override

Browse source 
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
This commit is contained in:
Sergei Trofimovich 2024-01-10 09:38:04 +00:00
parent 9c4e129963
commit b6063571b1
2 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/os-specific/linux/amdgpu-pro/default.nix
View file

@ -9,7 +9,7 @@
, perl , perl
, zlib , zlib
, expat , expat
, libffi , libffi_3_3
, libselinux , libselinux
, libdrm , libdrm
, udev , udev
@ -119,7 +119,7 @@ in stdenv.mkDerivation rec {
libxshmfence libxshmfence
elfutils elfutils
expat expat
libffi libffi_3_3
libselinux libselinux
# libudev is not listed in any dependencies, but is loaded dynamically # libudev is not listed in any dependencies, but is loaded dynamically
udev udev

10
pkgs/top-level/linux-kernels.nix
View file

@ -298,15 +298,7 @@ in {
akvcam = callPackage ../os-specific/linux/akvcam { }; akvcam = callPackage ../os-specific/linux/akvcam { };
amdgpu-pro = callPackage ../os-specific/linux/amdgpu-pro { 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";
};
});
};
apfs = callPackage ../os-specific/linux/apfs { }; apfs = callPackage ../os-specific/linux/apfs { };