diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2021-05-11 21:12:04 +0000 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2021-05-12 00:16:11 +0000 |
commit | e830db4320ac3b38c648d492b3d04c71a0860a54 (patch) | |
tree | 2c9e19b64e0fe81284be089d3679139a6c1c0236 /pkgs/development/compilers/llvm/8/lld/default.nix | |
parent | 37194a325de090747ce5f97a38de4329708c1912 (diff) | |
download | nixpkgs-e830db4320ac3b38c648d492b3d04c71a0860a54.tar nixpkgs-e830db4320ac3b38c648d492b3d04c71a0860a54.tar.gz nixpkgs-e830db4320ac3b38c648d492b3d04c71a0860a54.tar.bz2 nixpkgs-e830db4320ac3b38c648d492b3d04c71a0860a54.tar.lz nixpkgs-e830db4320ac3b38c648d492b3d04c71a0860a54.tar.xz nixpkgs-e830db4320ac3b38c648d492b3d04c71a0860a54.tar.zst nixpkgs-e830db4320ac3b38c648d492b3d04c71a0860a54.zip |
llvmPackages: Fix more inconsistencies
The main thing was using `llvm_meta` in all versions. Secondarily: - libunwindx7: Forgot to split outputs - libcxx{,abi} 12: Forgot to apply output-splitting patches. - simplify `useLLVM` stdenv-switching logic. - openmp always gets its own directory
Diffstat (limited to 'pkgs/development/compilers/llvm/8/lld/default.nix')
-rw-r--r-- | pkgs/development/compilers/llvm/8/lld/default.nix | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/pkgs/development/compilers/llvm/8/lld/default.nix b/pkgs/development/compilers/llvm/8/lld/default.nix index 696403d1bf6..66b59937e5f 100644 --- a/pkgs/development/compilers/llvm/8/lld/default.nix +++ b/pkgs/development/compilers/llvm/8/lld/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib, stdenv, llvm_meta , buildLlvmTools , fetch , cmake @@ -7,11 +7,11 @@ , version }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "lld"; inherit version; - src = fetch "lld" "121xhxrlvwy3k5nf6p1wv31whxlb635ssfkci8z93mwv4ja1xflz"; + src = fetch pname "121xhxrlvwy3k5nf6p1wv31whxlb635ssfkci8z93mwv4ja1xflz"; patches = [ ./gnu-install-dirs.patch @@ -28,10 +28,16 @@ stdenv.mkDerivation { outputs = [ "out" "lib" "dev" ]; - meta = { - description = "The LLVM Linker"; - homepage = "https://lld.llvm.org/"; - license = lib.licenses.ncsa; - platforms = lib.platforms.all; + meta = llvm_meta // { + homepage = "https://lld.llvm.org/"; + description = "The LLVM linker"; + longDescription = '' + LLD is a linker from the LLVM project that is a drop-in replacement for + system linkers and runs much faster than them. It also provides features + that are useful for toolchain developers. + The linker supports ELF (Unix), PE/COFF (Windows), Mach-O (macOS), and + WebAssembly in descending order of completeness. Internally, LLD consists + of several different linkers. + ''; }; } |