Unverified Commit 43408348 authored by John Ericson's avatar John Ericson Committed by GitHub
Browse files

libblake3: fix duplicate patch fields (#402869)

parents 4977d9ec fb539cb4

pkgs/by-name/li/libblake3/package.nix

+6 −9
Original line number Diff line number Diff line
@@ -27,6 +27,12 @@ stdenv.mkDerivation (finalAttrs: { 
      hash = "sha256-npCtM8nOFU8Tcu//IykjMs8aLU12d93+mIfKuxHkuaQ=";

      relative = "c";

    })

    # build(cmake): Relax Clang frontend variant detection (BLAKE3-team/BLAKE3#477)

    (fetchpatch {

      url = "https://patch-diff.githubusercontent.com/raw/BLAKE3-team/BLAKE3/pull/477.patch";

      hash = "sha256-kidCMGd/i9D9HLLTt7l1DbiU71sFTEyr3Vew4XHUHls=";

      relative = "c";

    })

  ];



  sourceRoot = finalAttrs.src.name + "/c";
@@ -38,15 +44,6 @@ stdenv.mkDerivation (finalAttrs: { 
    tbb_2021_11

  ];



  patches = [

    # build(cmake): Relax Clang frontend variant detection (BLAKE3-team/BLAKE3#477)

    (fetchpatch {

      url = "https://patch-diff.githubusercontent.com/raw/BLAKE3-team/BLAKE3/pull/477.patch";

      hash = "sha256-kidCMGd/i9D9HLLTt7l1DbiU71sFTEyr3Vew4XHUHls=";

      relative = "c";

    })

  ];



  cmakeFlags = [

    (lib.cmakeBool "BLAKE3_USE_TBB" useTBB)

    (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic))