gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #155462 from veprbl/pr/libcxx_12_no_apple_availability

Browse Source 
llvmPackages_{12,13,git}: don't try to patch non-existing _LIBCPP_USE_AVAILABILITY_APPLE
This commit is contained in:
Dmitry Kalinkin
2022-01-29 21:15:21 -05:00
committed by GitHub
parent 6ae3c24e5b 34523e76a2
commit 46244fa290
3 changed files with 0 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/compilers/llvm/12/libcxx/default.nix
View File

@@ -23,12 +23,6 @@ stdenv.mkDerivation {
../../libcxx-0001-musl-hacks.patch
];
# Prevent errors like "error: 'foo' is unavailable: introduced in macOS yy.zz"
postPatch = ''
substituteInPlace include/__config \
--replace "# define _LIBCPP_USE_AVAILABILITY_APPLE" ""
'';
preConfigure = lib.optionalString stdenv.hostPlatform.isMusl ''
patchShebangs utils/cat_files.py
'';

6
pkgs/development/compilers/llvm/13/libcxx/default.nix
View File

@@ -25,12 +25,6 @@ stdenv.mkDerivation rec {
../../libcxx-0001-musl-hacks.patch
];
# Prevent errors like "error: 'foo' is unavailable: introduced in macOS yy.zz"
postPatch = ''
substituteInPlace include/__config \
--replace "# define _LIBCPP_USE_AVAILABILITY_APPLE" ""
'';
preConfigure = lib.optionalString stdenv.hostPlatform.isMusl ''
patchShebangs utils/cat_files.py
'';

6
pkgs/development/compilers/llvm/git/libcxx/default.nix
View File

@@ -25,12 +25,6 @@ stdenv.mkDerivation rec {
../../libcxx-0001-musl-hacks.patch
];
# Prevent errors like "error: 'foo' is unavailable: introduced in macOS yy.zz"
postPatch = ''
substituteInPlace include/__config \
--replace "# define _LIBCPP_USE_AVAILABILITY_APPLE" ""
'';
preConfigure = lib.optionalString stdenv.hostPlatform.isMusl ''
patchShebangs utils/cat_files.py
'';