diff options
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/11/libc++/default.nix')
| -rw-r--r-- | infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/11/libc++/default.nix | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/11/libc++/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/11/libc++/default.nix index 7a34977afe24..6adb824f539d 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/11/libc++/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/11/libc++/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetch, cmake, python3, libcxxabi, llvm, fixDarwinDylibNames, version +{ lib, stdenv, fetch, fetchpatch, cmake, python3, libcxxabi, llvm, fixDarwinDylibNames, version , enableShared ? !stdenv.hostPlatform.isStatic }: @@ -6,7 +6,7 @@ stdenv.mkDerivation { pname = "libc++"; inherit version; - src = fetch "libcxx" "0gaybwkn76vhakvipxslp7pmv2wm7agxkqwk5f5aizhzc9lzdmcz"; + src = fetch "libcxx" "1rgqsqpgi0vkga5d7hy0iyfsqgzfz7q1xy7afdfa1snp1qjks8xv"; postUnpack = '' unpackFile ${libcxxabi.src} @@ -15,7 +15,14 @@ stdenv.mkDerivation { mv llvm-* llvm ''; - patches = lib.optional stdenv.hostPlatform.isMusl ../../libcxx-0001-musl-hacks.patch; + patches = [ + (fetchpatch { + # Backported from LLVM 12, avoids clashes with commonly used "block.h" header. + url = "https://github.com/llvm/llvm-project/commit/19bc9ea480b60b607a3e303f20c7a3a2ea553369.patch"; + sha256 = "sha256-aWa66ogmPkG0xHzSfcpD0qZyZQcNKwLV44js4eiun78="; + stripLen = 1; + }) + ] ++ lib.optional stdenv.hostPlatform.isMusl ../../libcxx-0001-musl-hacks.patch; preConfigure = lib.optionalString stdenv.hostPlatform.isMusl '' patchShebangs utils/cat_files.py |