From e5e69a7aedb9cd5c6c757bf26bc09c5a89d0d42c Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 19 Feb 2018 12:43:42 -0600
Subject: [PATCH] libc++5: tweak expression so as to avoid rebuild on non-musl
 for now

---
 pkgs/development/compilers/llvm/5/libc++/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/llvm/5/libc++/default.nix b/pkgs/development/compilers/llvm/5/libc++/default.nix
index 654a4360b3f8..9ddeea7ef79a 100644
--- a/pkgs/development/compilers/llvm/5/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/5/libc++/default.nix
@@ -9,9 +9,13 @@ stdenv.mkDerivation rec {
     unpackFile ${libcxxabi.src}
     export LIBCXXABI_INCLUDE_DIR="$PWD/$(ls -d libcxxabi-${version}*)/include"
   '';
-  patches = stdenv.lib.optionals stdenv.hostPlatform.isMusl [
+
+  # on next rebuild, this can be replaced with optionals; for now set to null to avoid
+  # patches = stdenv.lib.optionals stdenv.hostPlatform.isMusl [
+  patches = if stdenv.hostPlatform.isMusl then [
     ../../libcxx-0001-musl-hacks.patch
-  ];
+  ] else null;
+
   prePatch = ''
     substituteInPlace lib/CMakeLists.txt --replace "/usr/lib/libc++" "\''${LIBCXX_LIBCXXABI_LIB_PATH}/libc++"
   '';