Merge pull request #280002 from trofi/amdgpu-pro-libffi-pin

linuxPackages.amdgpu-pro: use `libffi_3_3`, not an override
This commit is contained in:
Weijia Wang 2024-01-10 18:56:15 +01:00 committed by GitHub
commit 0b9c8af0d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 11 deletions

View File

@ -9,7 +9,7 @@
, perl
, zlib
, expat
, libffi
, libffi_3_3
, libselinux
, libdrm
, udev
@ -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

View File

@ -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 { };