Skip to content

Commit 61467b7

Browse files
authored
Merge pull request #12229 from RossComputerGuy/feat/llvm
Add LLVM to Flake
2 parents 8aafc05 + 47cf93b commit 61467b7

File tree

9 files changed

+13
-8
lines changed

9 files changed

+13
-8
lines changed

flake.nix

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@
107107
in {
108108
inherit stdenvs native;
109109
static = native.pkgsStatic;
110+
llvm = native.pkgsLLVM;
110111
cross = forAllCrossSystems (crossSystem: make-pkgs crossSystem "stdenv");
111112
});
112113

@@ -282,6 +283,7 @@
282283
# These attributes go right into `packages.<system>`.
283284
"${pkgName}" = nixpkgsFor.${system}.native.nixComponents.${pkgName};
284285
"${pkgName}-static" = nixpkgsFor.${system}.static.nixComponents.${pkgName};
286+
"${pkgName}-llvm" = nixpkgsFor.${system}.llvm.nixComponents.${pkgName};
285287
}
286288
// lib.optionalAttrs supportsCross (flatMapAttrs (lib.genAttrs crossSystems (_: { })) (crossSystem: {}: {
287289
# These attributes go right into `packages.<system>`.
@@ -321,6 +323,9 @@
321323
prefixAttrs "static" (forAllStdenvs (stdenvName: makeShell {
322324
pkgs = nixpkgsFor.${system}.stdenvs."${stdenvName}Packages".pkgsStatic;
323325
})) //
326+
prefixAttrs "llvm" (forAllStdenvs (stdenvName: makeShell {
327+
pkgs = nixpkgsFor.${system}.stdenvs."${stdenvName}Packages".pkgsLLVM;
328+
})) //
324329
prefixAttrs "cross" (forAllCrossSystems (crossSystem: makeShell {
325330
pkgs = nixpkgsFor.${system}.cross.${crossSystem};
326331
}))

src/libcmd/package.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ mkMesonLibrary (finalAttrs: {
7676
(lib.mesonOption "readline-flavor" readlineFlavor)
7777
];
7878

79-
env = lib.optionalAttrs (stdenv.isLinux && !(stdenv.hostPlatform.isStatic && stdenv.system == "aarch64-linux")) {
79+
env = lib.optionalAttrs (stdenv.isLinux && !(stdenv.hostPlatform.isStatic && stdenv.system == "aarch64-linux") && !(stdenv.hostPlatform.useLLVM or false)) {
8080
LDFLAGS = "-fuse-ld=gold";
8181
};
8282

src/libexpr/package.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ mkMesonLibrary (finalAttrs: {
9696
# https://github.com/NixOS/nixpkgs/issues/86131.
9797
BOOST_INCLUDEDIR = "${lib.getDev boost}/include";
9898
BOOST_LIBRARYDIR = "${lib.getLib boost}/lib";
99-
} // lib.optionalAttrs (stdenv.isLinux && !(stdenv.hostPlatform.isStatic && stdenv.system == "aarch64-linux")) {
99+
} // lib.optionalAttrs (stdenv.isLinux && !(stdenv.hostPlatform.isStatic && stdenv.system == "aarch64-linux") && !(stdenv.hostPlatform.useLLVM or false)) {
100100
LDFLAGS = "-fuse-ld=gold";
101101
};
102102

src/libfetchers/package.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ mkMesonLibrary (finalAttrs: {
4949
echo ${version} > ../../.version
5050
'';
5151

52-
env = lib.optionalAttrs (stdenv.isLinux && !(stdenv.hostPlatform.isStatic && stdenv.system == "aarch64-linux")) {
52+
env = lib.optionalAttrs (stdenv.isLinux && !(stdenv.hostPlatform.isStatic && stdenv.system == "aarch64-linux") && !(stdenv.hostPlatform.useLLVM or false)) {
5353
LDFLAGS = "-fuse-ld=gold";
5454
};
5555

src/libflake/package.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ mkMesonLibrary (finalAttrs: {
4848
echo ${version} > ../../.version
4949
'';
5050

51-
env = lib.optionalAttrs (stdenv.isLinux && !(stdenv.hostPlatform.isStatic && stdenv.system == "aarch64-linux")) {
51+
env = lib.optionalAttrs (stdenv.isLinux && !(stdenv.hostPlatform.isStatic && stdenv.system == "aarch64-linux") && !(stdenv.hostPlatform.useLLVM or false)) {
5252
LDFLAGS = "-fuse-ld=gold";
5353
};
5454

src/libmain/package.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ mkMesonLibrary (finalAttrs: {
4545
echo ${version} > ../../.version
4646
'';
4747

48-
env = lib.optionalAttrs (stdenv.isLinux && !(stdenv.hostPlatform.isStatic && stdenv.system == "aarch64-linux")) {
48+
env = lib.optionalAttrs (stdenv.isLinux && !(stdenv.hostPlatform.isStatic && stdenv.system == "aarch64-linux") && !(stdenv.hostPlatform.useLLVM or false)) {
4949
LDFLAGS = "-fuse-ld=gold";
5050
};
5151

src/libstore/package.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ mkMesonLibrary (finalAttrs: {
8787
# https://github.com/NixOS/nixpkgs/issues/86131.
8888
BOOST_INCLUDEDIR = "${lib.getDev boost}/include";
8989
BOOST_LIBRARYDIR = "${lib.getLib boost}/lib";
90-
} // lib.optionalAttrs (stdenv.isLinux && !(stdenv.hostPlatform.isStatic && stdenv.system == "aarch64-linux")) {
90+
} // lib.optionalAttrs (stdenv.isLinux && !(stdenv.hostPlatform.isStatic && stdenv.system == "aarch64-linux") && !(stdenv.hostPlatform.useLLVM or false)) {
9191
LDFLAGS = "-fuse-ld=gold";
9292
};
9393

src/libutil/package.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ mkMesonLibrary (finalAttrs: {
7272
# https://github.com/NixOS/nixpkgs/issues/86131.
7373
BOOST_INCLUDEDIR = "${lib.getDev boost}/include";
7474
BOOST_LIBRARYDIR = "${lib.getLib boost}/lib";
75-
} // lib.optionalAttrs (stdenv.isLinux && !(stdenv.hostPlatform.isStatic && stdenv.system == "aarch64-linux")) {
75+
} // lib.optionalAttrs (stdenv.isLinux && !(stdenv.hostPlatform.isStatic && stdenv.system == "aarch64-linux") && !(stdenv.hostPlatform.useLLVM or false)) {
7676
LDFLAGS = "-fuse-ld=gold";
7777
};
7878

src/nix/package.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ mkMesonExecutable (finalAttrs: {
9999
mesonFlags = [
100100
];
101101

102-
env = lib.optionalAttrs (stdenv.isLinux && !(stdenv.hostPlatform.isStatic && stdenv.system == "aarch64-linux")) {
102+
env = lib.optionalAttrs (stdenv.isLinux && !(stdenv.hostPlatform.isStatic && stdenv.system == "aarch64-linux") && !(stdenv.hostPlatform.useLLVM)) {
103103
LDFLAGS = "-fuse-ld=gold";
104104
};
105105

0 commit comments

Comments
 (0)