Loading pkgs/development/compilers/llvm/common/lldb/default.nix +2 −11 Original line number Diff line number Diff line Loading @@ -74,6 +74,7 @@ stdenv.mkDerivation ( nativeBuildInputs = [ cmake ninja python3 which swig Loading @@ -84,10 +85,6 @@ stdenv.mkDerivation ( ++ lib.optionals enableManpages [ python3.pkgs.sphinx python3.pkgs.myst-parser ] # TODO: Clean up on `staging`. ++ [ ninja ]; buildInputs = [ Loading @@ -112,6 +109,7 @@ stdenv.mkDerivation ( (lib.cmakeBool "LLVM_ENABLE_RTTI" false) (lib.cmakeFeature "Clang_DIR" "${lib.getDev libclang}/lib/cmake") (lib.cmakeFeature "LLVM_EXTERNAL_LIT" "${lit}/bin/lit") (lib.cmakeFeature "CLANG_RESOURCE_DIR" "../../../../${lib.getLib libclang}") ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ (lib.cmakeBool "LLDB_USE_SYSTEM_DEBUGSERVER" true) Loading @@ -119,10 +117,6 @@ stdenv.mkDerivation ( ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ (lib.cmakeFeature "LLDB_CODESIGN_IDENTITY" "") # codesigning makes nondeterministic ] # TODO: Clean up on `staging`. ++ [ (lib.cmakeFeature "CLANG_RESOURCE_DIR" "../../../../${lib.getLib libclang}") ] ++ lib.optionals enableManpages [ (lib.cmakeBool "LLVM_ENABLE_SPHINX" true) (lib.cmakeBool "SPHINX_OUTPUT_MAN" true) Loading Loading @@ -184,9 +178,6 @@ stdenv.mkDerivation ( // lib.optionalAttrs enableManpages { pname = "lldb-manpages"; # TODO: Remove on `staging`. buildPhase = ""; ninjaFlags = [ "docs-lldb-man" ]; propagatedBuildInputs = [ ]; Loading Loading
pkgs/development/compilers/llvm/common/lldb/default.nix +2 −11 Original line number Diff line number Diff line Loading @@ -74,6 +74,7 @@ stdenv.mkDerivation ( nativeBuildInputs = [ cmake ninja python3 which swig Loading @@ -84,10 +85,6 @@ stdenv.mkDerivation ( ++ lib.optionals enableManpages [ python3.pkgs.sphinx python3.pkgs.myst-parser ] # TODO: Clean up on `staging`. ++ [ ninja ]; buildInputs = [ Loading @@ -112,6 +109,7 @@ stdenv.mkDerivation ( (lib.cmakeBool "LLVM_ENABLE_RTTI" false) (lib.cmakeFeature "Clang_DIR" "${lib.getDev libclang}/lib/cmake") (lib.cmakeFeature "LLVM_EXTERNAL_LIT" "${lit}/bin/lit") (lib.cmakeFeature "CLANG_RESOURCE_DIR" "../../../../${lib.getLib libclang}") ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ (lib.cmakeBool "LLDB_USE_SYSTEM_DEBUGSERVER" true) Loading @@ -119,10 +117,6 @@ stdenv.mkDerivation ( ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ (lib.cmakeFeature "LLDB_CODESIGN_IDENTITY" "") # codesigning makes nondeterministic ] # TODO: Clean up on `staging`. ++ [ (lib.cmakeFeature "CLANG_RESOURCE_DIR" "../../../../${lib.getLib libclang}") ] ++ lib.optionals enableManpages [ (lib.cmakeBool "LLVM_ENABLE_SPHINX" true) (lib.cmakeBool "SPHINX_OUTPUT_MAN" true) Loading Loading @@ -184,9 +178,6 @@ stdenv.mkDerivation ( // lib.optionalAttrs enableManpages { pname = "lldb-manpages"; # TODO: Remove on `staging`. buildPhase = ""; ninjaFlags = [ "docs-lldb-man" ]; propagatedBuildInputs = [ ]; Loading