diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2019-07-11 20:09:55 -0400 |
|---|---|---|
| committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2019-07-17 10:30:05 +0200 |
| commit | 325f37f93512fccbcfd8b60b7f3d9a15708d0372 (patch) | |
| tree | a284152f2cf7bcc734052d7aa7ce075d65d42d13 /pkgs/development/compilers/llvm/8 | |
| parent | c9965679489f7a8bf1bac0d4a8983d7372186832 (diff) | |
| download | nixlib-325f37f93512fccbcfd8b60b7f3d9a15708d0372.tar nixlib-325f37f93512fccbcfd8b60b7f3d9a15708d0372.tar.gz nixlib-325f37f93512fccbcfd8b60b7f3d9a15708d0372.tar.bz2 nixlib-325f37f93512fccbcfd8b60b7f3d9a15708d0372.tar.lz nixlib-325f37f93512fccbcfd8b60b7f3d9a15708d0372.tar.xz nixlib-325f37f93512fccbcfd8b60b7f3d9a15708d0372.tar.zst nixlib-325f37f93512fccbcfd8b60b7f3d9a15708d0372.zip | |
llvm_*,clang_*: allow src overrides
Diffstat (limited to 'pkgs/development/compilers/llvm/8')
| -rw-r--r-- | pkgs/development/compilers/llvm/8/clang/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/compilers/llvm/8/llvm.nix | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/development/compilers/llvm/8/clang/default.nix b/pkgs/development/compilers/llvm/8/clang/default.nix index 5a8b8922eb06..0b38660c4c4d 100644 --- a/pkgs/development/compilers/llvm/8/clang/default.nix +++ b/pkgs/development/compilers/llvm/8/clang/default.nix @@ -8,8 +8,10 @@ let self = stdenv.mkDerivation ({ name = "clang-${version}"; + src = fetch "cfe" "0svk1f70hvpwrjp6x5i9kqwrqwxnmcrw5s7f4cxyd100mdd12k08"; + unpackPhase = '' - unpackFile ${fetch "cfe" "0svk1f70hvpwrjp6x5i9kqwrqwxnmcrw5s7f4cxyd100mdd12k08"} + unpackFile $src mv cfe-${version}* clang sourceRoot=$PWD/clang unpackFile ${clang-tools-extra_src} diff --git a/pkgs/development/compilers/llvm/8/llvm.nix b/pkgs/development/compilers/llvm/8/llvm.nix index 18013a9cfad5..1827273d57eb 100644 --- a/pkgs/development/compilers/llvm/8/llvm.nix +++ b/pkgs/development/compilers/llvm/8/llvm.nix @@ -23,9 +23,6 @@ let inherit (stdenv.lib) optional optionals optionalString; - src = fetch "llvm" "0k124sxkfhfi1rca6kzkdraf4axhx99x3cw2rk55056628dvwwl8"; - polly_src = fetch "polly" "1x4xv3j226rqdddp7b61d71wsx2b8vmmri02ycx27y2fg7ba7xg3"; - # Used when creating a version-suffixed symlink of libLLVM.dylib shortVersion = with stdenv.lib; concatStringsSep "." (take 1 (splitString "." release_version)); @@ -33,12 +30,15 @@ let in stdenv.mkDerivation (rec { name = "llvm-${version}"; + src = fetch "llvm" "0k124sxkfhfi1rca6kzkdraf4axhx99x3cw2rk55056628dvwwl8"; + polly_src = fetch "polly" "1x4xv3j226rqdddp7b61d71wsx2b8vmmri02ycx27y2fg7ba7xg3"; + unpackPhase = '' - unpackFile ${src} + unpackFile $src mv llvm-${version}* llvm sourceRoot=$PWD/llvm '' + optionalString enablePolly '' - unpackFile ${polly_src} + unpackFile $polly_src mv polly-* $sourceRoot/tools/polly ''; @@ -142,8 +142,6 @@ in stdenv.mkDerivation (rec { enableParallelBuilding = true; - passthru.src = src; - meta = { description = "Collection of modular and reusable compiler and toolchain technologies"; homepage = http://llvm.org/; |