diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-08-04 00:02:04 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-04 00:02:04 +0000 |
| commit | 0542af4e290c867dc16c1b91e1b39691ea3d9a57 (patch) | |
| tree | 7f3c9650c6b5c33c1ad5e9c8e8be0e55920f53f5 /pkgs/development/compilers/llvm/13 | |
| parent | bf170fec12fadd65070e190c0abbe1cca933b5a7 (diff) | |
| parent | 6dd8d1ffc7e24340c02ca89bbddc3b24b192352a (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/compilers/llvm/13')
8 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/development/compilers/llvm/13/clang/default.nix b/pkgs/development/compilers/llvm/13/clang/default.nix index b423f50d98227..a070e64c7ddd9 100644 --- a/pkgs/development/compilers/llvm/13/clang/default.nix +++ b/pkgs/development/compilers/llvm/13/clang/default.nix @@ -10,7 +10,7 @@ let inherit version; inherit src; - sourceRoot = "source/clang"; + sourceRoot = "${src.name}/clang"; nativeBuildInputs = [ cmake python3 ] ++ lib.optional enableManpages python3.pkgs.sphinx diff --git a/pkgs/development/compilers/llvm/13/compiler-rt/default.nix b/pkgs/development/compilers/llvm/13/compiler-rt/default.nix index faa123312bd76..18be4499d0fdb 100644 --- a/pkgs/development/compilers/llvm/13/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/13/compiler-rt/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { inherit version; inherit src; - sourceRoot = "source/compiler-rt"; + sourceRoot = "${src.name}/compiler-rt"; nativeBuildInputs = [ cmake python3 libllvm.dev ] ++ lib.optional stdenv.isDarwin xcbuild.xcrun; diff --git a/pkgs/development/compilers/llvm/13/libcxx/default.nix b/pkgs/development/compilers/llvm/13/libcxx/default.nix index b18c9da18ffda..994ec7dd5a56e 100644 --- a/pkgs/development/compilers/llvm/13/libcxx/default.nix +++ b/pkgs/development/compilers/llvm/13/libcxx/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { inherit version; inherit src; - sourceRoot = "source/libcxx"; + sourceRoot = "${src.name}/libcxx"; outputs = [ "out" ] ++ lib.optional (!headersOnly) "dev"; diff --git a/pkgs/development/compilers/llvm/13/libcxxabi/default.nix b/pkgs/development/compilers/llvm/13/libcxxabi/default.nix index 06137ab067342..b1b57b3050ad0 100644 --- a/pkgs/development/compilers/llvm/13/libcxxabi/default.nix +++ b/pkgs/development/compilers/llvm/13/libcxxabi/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { inherit version; inherit src; - sourceRoot = "source/${pname}"; + sourceRoot = "${src.name}/${pname}"; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/compilers/llvm/13/libunwind/default.nix b/pkgs/development/compilers/llvm/13/libunwind/default.nix index b6017e7417289..d837bc60de370 100644 --- a/pkgs/development/compilers/llvm/13/libunwind/default.nix +++ b/pkgs/development/compilers/llvm/13/libunwind/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { inherit version; inherit src; - sourceRoot = "source/${pname}"; + sourceRoot = "${src.name}/${pname}"; patches = [ ./gnu-install-dirs.patch diff --git a/pkgs/development/compilers/llvm/13/lld/default.nix b/pkgs/development/compilers/llvm/13/lld/default.nix index c8c3e0b448bd5..d506f396f65cd 100644 --- a/pkgs/development/compilers/llvm/13/lld/default.nix +++ b/pkgs/development/compilers/llvm/13/lld/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { inherit version; inherit src; - sourceRoot = "source/${pname}"; + sourceRoot = "${src.name}/${pname}"; patches = [ ./gnu-install-dirs.patch diff --git a/pkgs/development/compilers/llvm/13/llvm/default.nix b/pkgs/development/compilers/llvm/13/llvm/default.nix index 59c3edb9e2db9..827e528581cfd 100644 --- a/pkgs/development/compilers/llvm/13/llvm/default.nix +++ b/pkgs/development/compilers/llvm/13/llvm/default.nix @@ -61,7 +61,7 @@ in stdenv.mkDerivation (rec { inherit version; inherit src; - sourceRoot = "source/${pname}"; + sourceRoot = "${src.name}/${pname}"; outputs = [ "out" "lib" "dev" "python" ]; diff --git a/pkgs/development/compilers/llvm/13/openmp/default.nix b/pkgs/development/compilers/llvm/13/openmp/default.nix index 71362be1fdc6e..8eca980d601cc 100644 --- a/pkgs/development/compilers/llvm/13/openmp/default.nix +++ b/pkgs/development/compilers/llvm/13/openmp/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { inherit version; inherit src; - sourceRoot = "source/${pname}"; + sourceRoot = "${src.name}/${pname}"; nativeBuildInputs = [ cmake perl ]; buildInputs = [ |