Commit 1a148262 authored by Tristan Ross's avatar Tristan Ross Committed by Alyssa Ross
Browse files

llvmPackages_{12,13,14,15,16,17,18,19,20,git}.libunwind: move patches out of common

parent 20e4f33f

pkgs/development/compilers/llvm/common/default.nix

+0 −3
Original line number Diff line number Diff line
@@ -1086,9 +1086,6 @@ let 
        );



        libunwind = callPackage ./libunwind {

          patches = lib.optional (lib.versionOlder metadata.release_version "17") (

            metadata.getVersionFile "libunwind/gnu-install-dirs.patch"

          );

          stdenv = overrideCC stdenv buildLlvmTools.clangWithLibcAndBasicRt;

        };

pkgs/development/compilers/llvm/common/libunwind/default.nix

+5 −1
Original line number Diff line number Diff line 
{ lib

, stdenv

, release_version

, patches ? []

, src ? null

, llvm_meta

, version
@@ -13,6 +12,7 @@ 
, libcxx

, enableShared ? !stdenv.hostPlatform.isStatic

, devExtraCmakeFlags ? []

, getVersionFile

}:

let

  pname = "libunwind";
@@ -33,6 +33,10 @@ let 
      cp -r ${monorepoSrc}/runtimes "$out"

    '') else src;



  patches = lib.optional (lib.versionOlder release_version "17") (

    getVersionFile "libunwind/gnu-install-dirs.patch"

  );



  hasPatches = builtins.length patches > 0;



  prePatch = lib.optionalString (lib.versionAtLeast release_version "15" && (hasPatches || lib.versionOlder release_version "18")) ''