From ebcdd8b9b01afa9bbe57d432a00063a008c5f1e6 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 23 Jun 2018 11:55:48 -0500 Subject: [PATCH] llvm_4: refactor patch location, will be sharing shortly --- pkgs/development/compilers/llvm/4/libc++/default.nix | 2 +- pkgs/development/compilers/llvm/4/libc++abi.nix | 2 +- .../{4/libc++/max_align_t.patch => libcxx-max_align_t.patch} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename pkgs/development/compilers/llvm/{4/libc++/max_align_t.patch => libcxx-max_align_t.patch} (100%) diff --git a/pkgs/development/compilers/llvm/4/libc++/default.nix b/pkgs/development/compilers/llvm/4/libc++/default.nix index 718abc420a9..6ce9c0d4792 100644 --- a/pkgs/development/compilers/llvm/4/libc++/default.nix +++ b/pkgs/development/compilers/llvm/4/libc++/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ./xlocale-glibc-2.26.patch ] ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [ ../../libcxx-0001-musl-hacks.patch - ./max_align_t.patch + ../../libcxx-max_align_t.patch ]; prePatch = '' diff --git a/pkgs/development/compilers/llvm/4/libc++abi.nix b/pkgs/development/compilers/llvm/4/libc++abi.nix index 41eb40e124e..5eeec395b97 100644 --- a/pkgs/development/compilers/llvm/4/libc++abi.nix +++ b/pkgs/development/compilers/llvm/4/libc++abi.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { export TRIPLE=x86_64-apple-darwin '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-0001-musl-hacks.patch} - patch -p1 -d $(ls -d libcxx-*) -i ${./libc++/max_align_t.patch} + patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-max_align_t.patch} ''; installPhase = if stdenv.isDarwin diff --git a/pkgs/development/compilers/llvm/4/libc++/max_align_t.patch b/pkgs/development/compilers/llvm/libcxx-max_align_t.patch similarity index 100% rename from pkgs/development/compilers/llvm/4/libc++/max_align_t.patch rename to pkgs/development/compilers/llvm/libcxx-max_align_t.patch