diff options
| author | John Ericson <git@JohnEricson.me> | 2019-11-24 18:35:13 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-24 18:35:13 -0500 |
| commit | 6d3b7458cc8b10c61b4c9024d5a24e2c0eb5ed85 (patch) | |
| tree | 20539c52c68c21abea4970aac8da7592f1c6fa77 /pkgs/development/compilers/llvm/6 | |
| parent | 4f1261134ef3166910e57ec84e2fcc21279cf99d (diff) | |
| parent | ef328622e0dbcdd28f8a42481633ff8db5db8f10 (diff) | |
Merge pull request #74065 from Ericson2314/cc-versions
compilers, binutils: Add version and pname
Diffstat (limited to 'pkgs/development/compilers/llvm/6')
| -rw-r--r-- | pkgs/development/compilers/llvm/6/clang/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/development/compilers/llvm/6/llvm.nix | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/development/compilers/llvm/6/clang/default.nix b/pkgs/development/compilers/llvm/6/clang/default.nix index ff9064f455ec..d093379b3c99 100644 --- a/pkgs/development/compilers/llvm/6/clang/default.nix +++ b/pkgs/development/compilers/llvm/6/clang/default.nix @@ -6,7 +6,8 @@ let gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc; self = stdenv.mkDerivation ({ - name = "clang-${version}"; + pname = "clang"; + inherit version; src = fetch "cfe" "0rxn4rh7rrnsqbdgp4gzc8ishbkryhpl1kd3mpnxzpxxhla3y93w"; @@ -87,7 +88,7 @@ let platforms = stdenv.lib.platforms.all; }; } // stdenv.lib.optionalAttrs enableManpages { - name = "clang-manpages-${version}"; + pname = "clang-manpages"; buildPhase = '' make docs-clang-man diff --git a/pkgs/development/compilers/llvm/6/llvm.nix b/pkgs/development/compilers/llvm/6/llvm.nix index a250c9fefac7..c6d2c09c2df6 100644 --- a/pkgs/development/compilers/llvm/6/llvm.nix +++ b/pkgs/development/compilers/llvm/6/llvm.nix @@ -26,7 +26,8 @@ let in stdenv.mkDerivation ({ - name = "llvm-${version}"; + pname = "llvm"; + inherit version; src = fetch "llvm" "1qpls3vk85lydi5b4axl0809fv932qgsqgdgrk098567z4jc7mmn"; @@ -154,7 +155,7 @@ stdenv.mkDerivation ({ platforms = stdenv.lib.platforms.all; }; } // stdenv.lib.optionalAttrs enableManpages { - name = "llvm-manpages-${version}"; + pname = "llvm-manpages"; buildPhase = '' make docs-llvm-man |