Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

llvmPackages.lldb: hash changing post-deduplication changes

Use ninja for 14 too, fails for <14.

Artturin e9bc0852 98090246

+29 -40
+29 -40
pkgs/development/compilers/llvm/common/lldb.nix
··· 45 45 46 46 outputs = [ "out" "lib" "dev" ]; 47 47 48 - sourceRoot = 49 - if lib.versionOlder release_version "13" then null 50 - else "${src.name}/${pname}"; 48 + sourceRoot = lib.optional (lib.versionAtLeast release_version "13") "${src.name}/${pname}"; 51 49 52 50 nativeBuildInputs = [ 53 51 cmake 54 - ] ++ lib.optionals (lib.versionAtLeast release_version "15") [ 55 - ninja 56 - ] ++ [ 57 52 python3 58 53 which 59 54 swig 60 55 lit 61 56 makeWrapper 62 - ] ++ lib.optionals (lib.versionAtLeast release_version "14") [ 63 57 lua5_3 64 58 ] ++ lib.optionals enableManpages [ 65 59 python3.pkgs.sphinx 66 60 python3.pkgs.recommonmark 61 + ] ++ lib.optionals (lib.versionAtLeast release_version "14") [ 62 + ninja 67 63 ]; 68 64 69 65 buildInputs = [ ··· 87 83 # 88 84 # See here for context: 89 85 # https://github.com/NixOS/nixpkgs/pull/194634#issuecomment-1272129132 90 - ++ lib.optional ( 86 + ++ lib.optional 87 + ( 91 88 stdenv.targetPlatform.isDarwin 92 - && !stdenv.targetPlatform.isAarch64 93 - && (lib.versionAtLeast release_version "15") 94 - ) ( 89 + && !stdenv.targetPlatform.isAarch64 90 + && (lib.versionAtLeast release_version "15") 91 + ) 92 + ( 95 93 runCommand "bsm-audit-session-header" { } '' 96 94 install -Dm444 \ 97 95 "${lib.getDev darwin.apple_sdk.sdk}/include/bsm/audit_session.h" \ ··· 104 102 cmakeFlags = [ 105 103 "-DLLDB_INCLUDE_TESTS=${if doCheck then "YES" else "NO"}" 106 104 "-DLLVM_ENABLE_RTTI=OFF" 107 - "-DClang_DIR=${libclang.dev}/lib/cmake" 105 + "-DClang_DIR=${lib.getDev libclang}/lib/cmake" 108 106 "-DLLVM_EXTERNAL_LIT=${lit}/bin/lit" 109 107 ] ++ lib.optionals stdenv.isDarwin [ 110 108 "-DLLDB_USE_SYSTEM_DEBUGSERVER=ON" ··· 127 125 ]; 128 126 129 127 doCheck = false; 128 + doInstallCheck = lib.versionOlder release_version "15"; 130 129 131 130 # TODO: cleanup with mass-rebuild 132 - installCheckPhase = 133 - if ((lib.versions.major release_version) == "14") then '' 134 - if [ ! -e $lib/${python3.sitePackages}/lldb/_lldb*.so ] ; then 135 - echo "ERROR: python files not installed where expected!"; 136 - return 1; 137 - fi 138 - if [ ! -e "$lib/lib/lua/${lua5_3.luaversion}/lldb.so" ] ; then 139 - echo "ERROR: lua files not installed where expected!"; 140 - return 1; 141 - fi 142 - '' else if (((lib.versions.major release_version) == "15") || (lib.versions.major release_version) == "16") then '' 143 - if [ ! -e "$lib/${python3.sitePackages}/lldb/_lldb.so" ] ; then 144 - return 1; 145 - fi 146 - '' else '' 147 - if [ ! -e "$lib/${python3.sitePackages}/lldb/_lldb.so" ] ; then 148 - echo "ERROR: python files not installed where expected!"; 149 - return 1; 150 - fi 151 - ''; 131 + installCheckPhase = '' 132 + if [ ! -e $lib/${python3.sitePackages}/lldb/_lldb*.so ] ; then 133 + echo "ERROR: python files not installed where expected!"; 134 + return 1; 135 + fi 136 + '' # Something lua is built on older versions but this file doesn't exist. 137 + + lib.optionalString (lib.versionAtLeast release_version "14") '' 138 + if [ ! -e "$lib/lib/lua/${lua5_3.luaversion}/lldb.so" ] ; then 139 + echo "ERROR: lua files not installed where expected!"; 140 + return 1; 141 + fi 142 + ''; 152 143 153 144 postInstall = '' 154 145 wrapProgram $out/bin/lldb --prefix PYTHONPATH : $lib/${python3.sitePackages}/ ··· 157 148 # vscode: 158 149 install -D ../tools/lldb-vscode/package.json $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/package.json 159 150 mkdir -p $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin 160 - ln -s $out/bin/${if (lib.versionOlder release_version "12") then "llvm-vscode" else "lldb-vscode"} $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin 151 + ln -s $out/bin/*-vscode $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin 161 152 ''; 162 153 163 154 meta = llvm_meta // { ··· 174 165 (lib.versionOlder release_version "11" && stdenv.isDarwin && stdenv.isAarch64) 175 166 || (((lib.versions.major release_version) == "13") && stdenv.isDarwin); 176 167 }; 177 - } // lib.optionalAttrs (lib.versionOlder release_version "15") { 178 - doInstallCheck = true; 179 168 } // lib.optionalAttrs enableManpages { 180 169 pname = "lldb-manpages"; 181 170 182 - buildPhase = 183 - if lib.versionOlder release_version "15" then '' 184 - make ${if (lib.versionOlder release_version "12") then "docs-man" else "docs-lldb-man"} 185 - '' else null; 171 + buildPhase = lib.optionalString (lib.versionOlder release_version "15") '' 172 + make ${if (lib.versionOlder release_version "12") then "docs-man" else "docs-lldb-man"} 173 + ''; 186 174 187 - ninjaFlags = if lib.versionAtLeast release_version "15" then [ "docs-lldb-man" ] else null; 175 + 176 + ninjaFlags = lib.optionals (lib.versionAtLeast release_version "15") [ "docs-lldb-man" ]; 188 177 189 178 propagatedBuildInputs = [ ]; 190 179