From b67ae8b33c38b442a7d0f4bed0e68a8cd85e22bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 28 Nov 2016 18:55:04 +0100 Subject: [PATCH] llvmPackages*.lldb: fixup input by disabling libedit Fixes #20773. https://llvm.org/bugs/show_bug.cgi?id=28898 Of course, feel free to find a better solution. I love this copy&paste :-/ --- pkgs/development/compilers/llvm/3.4/lldb.nix | 1 + pkgs/development/compilers/llvm/3.5/lldb.nix | 1 + pkgs/development/compilers/llvm/3.6/lldb.nix | 1 + pkgs/development/compilers/llvm/3.7/lldb.nix | 1 + pkgs/development/compilers/llvm/3.8/lldb.nix | 1 + pkgs/development/compilers/llvm/3.9/lldb.nix | 1 + 6 files changed, 6 insertions(+) diff --git a/pkgs/development/compilers/llvm/3.4/lldb.nix b/pkgs/development/compilers/llvm/3.4/lldb.nix index cd498b5cf519..9d42d81923a2 100644 --- a/pkgs/development/compilers/llvm/3.4/lldb.nix +++ b/pkgs/development/compilers/llvm/3.4/lldb.nix @@ -29,6 +29,7 @@ stdenv.mkDerivation { "-DCMAKE_CXX_FLAGS=-std=c++11" "-DLLDB_PATH_TO_LLVM_BUILD=${llvm}" "-DLLDB_PATH_TO_CLANG_BUILD=${clang}" + "-DLLDB_DISABLE_LIBEDIT=1" # https://llvm.org/bugs/show_bug.cgi?id=28898 ]; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/llvm/3.5/lldb.nix b/pkgs/development/compilers/llvm/3.5/lldb.nix index 8e7c8151df13..bbffa1a9a938 100644 --- a/pkgs/development/compilers/llvm/3.5/lldb.nix +++ b/pkgs/development/compilers/llvm/3.5/lldb.nix @@ -29,6 +29,7 @@ stdenv.mkDerivation { "-DCMAKE_CXX_FLAGS=-std=c++11" "-DLLDB_PATH_TO_LLVM_BUILD=${llvm}" "-DLLDB_PATH_TO_CLANG_BUILD=${clang}" + "-DLLDB_DISABLE_LIBEDIT=1" # https://llvm.org/bugs/show_bug.cgi?id=28898 ]; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/llvm/3.6/lldb.nix b/pkgs/development/compilers/llvm/3.6/lldb.nix index 207971b81727..17f7f5793b98 100644 --- a/pkgs/development/compilers/llvm/3.6/lldb.nix +++ b/pkgs/development/compilers/llvm/3.6/lldb.nix @@ -29,6 +29,7 @@ stdenv.mkDerivation { "-DCMAKE_CXX_FLAGS=-std=c++11" "-DLLDB_PATH_TO_LLVM_BUILD=${llvm}" "-DLLDB_PATH_TO_CLANG_BUILD=${clang-unwrapped}" + "-DLLDB_DISABLE_LIBEDIT=1" # https://llvm.org/bugs/show_bug.cgi?id=28898 ]; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/llvm/3.7/lldb.nix b/pkgs/development/compilers/llvm/3.7/lldb.nix index 434fdc7650ff..36f9cb1f1398 100644 --- a/pkgs/development/compilers/llvm/3.7/lldb.nix +++ b/pkgs/development/compilers/llvm/3.7/lldb.nix @@ -35,6 +35,7 @@ stdenv.mkDerivation { "-DLLDB_PATH_TO_CLANG_BUILD=${clang-unwrapped}" "-DPYTHON_VERSION_MAJOR=2" "-DPYTHON_VERSION_MINOR=7" + "-DLLDB_DISABLE_LIBEDIT=1" # https://llvm.org/bugs/show_bug.cgi?id=28898 ]; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/llvm/3.8/lldb.nix b/pkgs/development/compilers/llvm/3.8/lldb.nix index 568476e44ac2..fe0dcfc83060 100644 --- a/pkgs/development/compilers/llvm/3.8/lldb.nix +++ b/pkgs/development/compilers/llvm/3.8/lldb.nix @@ -36,6 +36,7 @@ stdenv.mkDerivation { "-DCLANG_MAIN_INCLUDE_DIR=${clang-unwrapped}/include" "-DPYTHON_VERSION_MAJOR=2" "-DPYTHON_VERSION_MINOR=7" + "-DLLDB_DISABLE_LIBEDIT=1" # https://llvm.org/bugs/show_bug.cgi?id=28898 ]; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/llvm/3.9/lldb.nix b/pkgs/development/compilers/llvm/3.9/lldb.nix index 0acef48f57b4..55c00eb07fcb 100644 --- a/pkgs/development/compilers/llvm/3.9/lldb.nix +++ b/pkgs/development/compilers/llvm/3.9/lldb.nix @@ -42,6 +42,7 @@ stdenv.mkDerivation { cmakeFlags = [ "-DLLVM_MAIN_INCLUDE_DIR=${llvm}/include" + "-DLLDB_DISABLE_LIBEDIT=1" # https://llvm.org/bugs/show_bug.cgi?id=28898 ]; enableParallelBuilding = true;