Unverified Commit f3ea8478 authored by Sam's avatar Sam
Browse files

swiftPackages.swift{,-corelibs-libdispatch}: fix build with modern clang 

We apply this patch to the copy of libdispatch that's copied into Swift
and to the standalone build.
parent 60a9738e

pkgs/development/compilers/swift/compiler/default.nix

+7 −0
Original line number Diff line number Diff line
@@ -425,6 +425,13 @@ stdenv.mkDerivation { 
           hash = "sha256-wPZQ4wtEWk8HaKMfzjamlU6p/IW5EFiTssY63rGM+ZA=";

         }

       }

       patch -p1 -d swift-corelibs-libdispatch -i ${

         # Fix the build with modern Clang.

         fetchpatch {

           url = "https://github.com/swiftlang/swift-corelibs-libdispatch/commit/38872e2d44d66d2fb94186988509defc734888a5.patch";

           hash = "sha256-GABwDeTjciV36Sa0FS10mCfFCqRoBBstgW/OiKdPahA=";

         }

       }

     ''}

  '';

pkgs/development/compilers/swift/libdispatch/default.nix

+4 −0
Original line number Diff line number Diff line
@@ -38,6 +38,10 @@ stdenv.mkDerivation { 
      url = "https://github.com/swiftlang/swift-corelibs-libdispatch/commit/30bb8019ba79cdae0eb1dc0c967c17996dd5cc0a.patch";

      hash = "sha256-wPZQ4wtEWk8HaKMfzjamlU6p/IW5EFiTssY63rGM+ZA=";

    })

    (fetchpatch {

      url = "https://github.com/swiftlang/swift-corelibs-libdispatch/commit/38872e2d44d66d2fb94186988509defc734888a5.patch";

      hash = "sha256-GABwDeTjciV36Sa0FS10mCfFCqRoBBstgW/OiKdPahA=";

    })



    ./disable-swift-overlay.patch

  ];