public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge older staging (finished on Hydra)

Browse Source 
https://hydra.nixos.org/eval/1427837?filter=&compare=1427817
Fixes #34087.
This commit is contained in:
Vladimír Čunát
2018-01-22 08:54:37 +01:00
parent 699d715f24 94f4857bc5
commit 246ba46db7
14 changed files with 87 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/compilers/llvm/3.8/clang/default.nix
View File

@@ -40,6 +40,8 @@ let
# Move libclang to 'lib' output
moveToOutput "lib/libclang.*" "$lib"
substituteInPlace $out/share/clang/cmake/ClangTargets-release.cmake \
--replace "\''${_IMPORT_PREFIX}/lib/libclang." "$lib/lib/libclang."
mkdir -p $python/bin $python/share/clang/
mv $out/bin/{git-clang-format,scan-view} $python/bin

2
pkgs/development/compilers/llvm/3.9/clang/default.nix
View File

@@ -42,6 +42,8 @@ let
# Move libclang to 'lib' output
moveToOutput "lib/libclang.*" "$lib"
substituteInPlace $out/lib/cmake/clang/ClangTargets-release.cmake \
--replace "\''${_IMPORT_PREFIX}/lib/libclang." "$lib/lib/libclang."
mkdir -p $python/bin $python/share/clang/
mv $out/bin/{git-clang-format,scan-view} $python/bin

2
pkgs/development/compilers/llvm/4/clang/default.nix
View File

@@ -59,6 +59,8 @@ let
# Move libclang to 'lib' output
moveToOutput "lib/libclang.*" "$lib"
substituteInPlace $out/lib/cmake/clang/ClangTargets-release.cmake \
--replace "\''${_IMPORT_PREFIX}/lib/libclang." "$lib/lib/libclang."
mkdir -p $python/bin $python/share/clang/
mv $out/bin/{git-clang-format,scan-view} $python/bin

2
pkgs/development/compilers/llvm/5/clang/default.nix
View File

@@ -60,6 +60,8 @@ let
# Move libclang to 'lib' output
moveToOutput "lib/libclang.*" "$lib"
substituteInPlace $out/lib/cmake/clang/ClangTargets-release.cmake \
--replace "\''${_IMPORT_PREFIX}/lib/libclang." "$lib/lib/libclang."
mkdir -p $python/bin $python/share/clang/
mv $out/bin/{git-clang-format,scan-view} $python/bin