Unverified Commit 0b9c8af0 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

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

linuxPackages.amdgpu-pro: use `libffi_3_3`, not an override
parents 485a5744 b6063571

pkgs/os-specific/linux/amdgpu-pro/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -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

pkgs/top-level/linux-kernels.nix

+1 −9
Original line number Diff line number Diff line
@@ -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 { };