cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #305867 from reckenrode/llvm-fixpoint

Browse source 
llvmPackages_{12,13,14,15,16,17,18,git}: use fixpoint instead of rec
This commit is contained in:
Randy Eckenrode 2024-04-21 21:25:55 -04:00 committed by GitHub
commit 9dc4bec1a2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/compilers/llvm/12/default.nix
View file

@ -56,7 +56,7 @@ let
then tools.bintools
else bootBintools;
in rec {
in {
libllvm = callPackage ./llvm {
inherit llvm_meta;
@ -74,7 +74,7 @@ let
./clang/gnu-install-dirs.patch
(substituteAll {
src = ../common/clang/clang-11-15-LLVMgold-path.patch;
libllvmLibdir = "${libllvm.lib}/lib";
libllvmLibdir = "${tools.libllvm.lib}/lib";
})
];
inherit clang-tools-extra_src llvm_meta;

4
pkgs/development/compilers/llvm/13/default.nix
View file

@ -82,7 +82,7 @@ in let
then tools.bintools
else bootBintools;
in rec {
in {
libllvm = callPackage ./llvm {
inherit llvm_meta;
@ -105,7 +105,7 @@ in let
../common/clang/add-nostdlibinc-flag.patch
(substituteAll {
src = ../common/clang/clang-11-15-LLVMgold-path.patch;
libllvmLibdir = "${libllvm.lib}/lib";
libllvmLibdir = "${tools.libllvm.lib}/lib";
})
];
inherit llvm_meta;

4
pkgs/development/compilers/llvm/14/default.nix
View file

@ -78,7 +78,7 @@ in let
then tools.bintools
else bootBintools;
in rec {
in {
libllvm = callPackage ./llvm {
inherit llvm_meta;
@ -96,7 +96,7 @@ in let
../common/clang/add-nostdlibinc-flag.patch
(substituteAll {
src = ../common/clang/clang-11-15-LLVMgold-path.patch;
libllvmLibdir = "${libllvm.lib}/lib";
libllvmLibdir = "${tools.libllvm.lib}/lib";
})
];
inherit llvm_meta;

4
pkgs/development/compilers/llvm/15/default.nix
View file

@ -84,7 +84,7 @@ in let
then tools.bintools
else bootBintools;
in rec {
in {
libllvm = callPackage ./llvm {
inherit llvm_meta;
@ -102,7 +102,7 @@ in let
../common/clang/add-nostdlibinc-flag.patch
(substituteAll {
src = ../common/clang/clang-11-15-LLVMgold-path.patch;
libllvmLibdir = "${libllvm.lib}/lib";
libllvmLibdir = "${tools.libllvm.lib}/lib";
})
];
inherit llvm_meta;

4
pkgs/development/compilers/llvm/16/default.nix
View file

@ -85,7 +85,7 @@ in let
then tools.bintools
else bootBintools;
in rec {
in {
libllvm = callPackage ./llvm {
inherit llvm_meta;
@ -103,7 +103,7 @@ in let
../common/clang/add-nostdlibinc-flag.patch
(substituteAll {
src = ../common/clang/clang-at-least-16-LLVMgold-path.patch;
libllvmLibdir = "${libllvm.lib}/lib";
libllvmLibdir = "${tools.libllvm.lib}/lib";
})
];
inherit llvm_meta;

4
pkgs/development/compilers/llvm/17/default.nix
View file

@ -80,7 +80,7 @@ in let
then tools.bintools
else bootBintools;
in rec {
in {
libllvm = callPackage ./llvm {
inherit llvm_meta;
@ -98,7 +98,7 @@ in let
../common/clang/add-nostdlibinc-flag.patch
(substituteAll {
src = ../common/clang/clang-at-least-16-LLVMgold-path.patch;
libllvmLibdir = "${libllvm.lib}/lib";
libllvmLibdir = "${tools.libllvm.lib}/lib";
})
];
inherit llvm_meta;

4
pkgs/development/compilers/llvm/18/default.nix
View file

@ -80,7 +80,7 @@ in let
then tools.bintools
else bootBintools;
in rec {
in {
libllvm = callPackage ./llvm {
inherit llvm_meta;
@ -98,7 +98,7 @@ in let
../common/clang/add-nostdlibinc-flag.patch
(substituteAll {
src = ../common/clang/clang-at-least-16-LLVMgold-path.patch;
libllvmLibdir = "${libllvm.lib}/lib";
libllvmLibdir = "${tools.libllvm.lib}/lib";
})
];
inherit llvm_meta;

4
pkgs/development/compilers/llvm/git/default.nix
View file

@ -85,7 +85,7 @@ in let
then tools.bintools
else bootBintools;
in rec {
in {
libllvm = callPackage ./llvm {
inherit llvm_meta;
@ -103,7 +103,7 @@ in let
../common/clang/add-nostdlibinc-flag.patch
(substituteAll {
src = ../common/clang/clang-at-least-16-LLVMgold-path.patch;
libllvmLibdir = "${libllvm.lib}/lib";
libllvmLibdir = "${tools.libllvm.lib}/lib";
})
];
inherit llvm_meta;