File tree Expand file tree Collapse file tree 9 files changed +13
-8
lines changed Expand file tree Collapse file tree 9 files changed +13
-8
lines changed Original file line number Diff line number Diff line change 107
107
in {
108
108
inherit stdenvs native ;
109
109
static = native . pkgsStatic ;
110
+ llvm = native . pkgsLLVM ;
110
111
cross = forAllCrossSystems ( crossSystem : make-pkgs crossSystem "stdenv" ) ;
111
112
} ) ;
112
113
282
283
# These attributes go right into `packages.<system>`.
283
284
"${ pkgName } " = nixpkgsFor . ${ system } . native . nixComponents . ${ pkgName } ;
284
285
"${ pkgName } -static" = nixpkgsFor . ${ system } . static . nixComponents . ${ pkgName } ;
286
+ "${ pkgName } -llvm" = nixpkgsFor . ${ system } . llvm . nixComponents . ${ pkgName } ;
285
287
}
286
288
// lib . optionalAttrs supportsCross ( flatMapAttrs ( lib . genAttrs crossSystems ( _ : { } ) ) ( crossSystem : { } : {
287
289
# These attributes go right into `packages.<system>`.
321
323
prefixAttrs "static" ( forAllStdenvs ( stdenvName : makeShell {
322
324
pkgs = nixpkgsFor . ${ system } . stdenvs . "${ stdenvName } Packages" . pkgsStatic ;
323
325
} ) ) //
326
+ prefixAttrs "llvm" ( forAllStdenvs ( stdenvName : makeShell {
327
+ pkgs = nixpkgsFor . ${ system } . stdenvs . "${ stdenvName } Packages" . pkgsLLVM ;
328
+ } ) ) //
324
329
prefixAttrs "cross" ( forAllCrossSystems ( crossSystem : makeShell {
325
330
pkgs = nixpkgsFor . ${ system } . cross . ${ crossSystem } ;
326
331
} ) )
Original file line number Diff line number Diff line change @@ -76,7 +76,7 @@ mkMesonLibrary (finalAttrs: {
76
76
( lib . mesonOption "readline-flavor" readlineFlavor )
77
77
] ;
78
78
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 ) ) {
80
80
LDFLAGS = "-fuse-ld=gold" ;
81
81
} ;
82
82
Original file line number Diff line number Diff line change @@ -96,7 +96,7 @@ mkMesonLibrary (finalAttrs: {
96
96
# https://github.com/NixOS/nixpkgs/issues/86131.
97
97
BOOST_INCLUDEDIR = "${ lib . getDev boost } /include" ;
98
98
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 ) ) {
100
100
LDFLAGS = "-fuse-ld=gold" ;
101
101
} ;
102
102
Original file line number Diff line number Diff line change @@ -49,7 +49,7 @@ mkMesonLibrary (finalAttrs: {
49
49
echo ${ version } > ../../.version
50
50
'' ;
51
51
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 ) ) {
53
53
LDFLAGS = "-fuse-ld=gold" ;
54
54
} ;
55
55
Original file line number Diff line number Diff line change @@ -48,7 +48,7 @@ mkMesonLibrary (finalAttrs: {
48
48
echo ${ version } > ../../.version
49
49
'' ;
50
50
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 ) ) {
52
52
LDFLAGS = "-fuse-ld=gold" ;
53
53
} ;
54
54
Original file line number Diff line number Diff line change @@ -45,7 +45,7 @@ mkMesonLibrary (finalAttrs: {
45
45
echo ${ version } > ../../.version
46
46
'' ;
47
47
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 ) ) {
49
49
LDFLAGS = "-fuse-ld=gold" ;
50
50
} ;
51
51
Original file line number Diff line number Diff line change @@ -87,7 +87,7 @@ mkMesonLibrary (finalAttrs: {
87
87
# https://github.com/NixOS/nixpkgs/issues/86131.
88
88
BOOST_INCLUDEDIR = "${ lib . getDev boost } /include" ;
89
89
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 ) ) {
91
91
LDFLAGS = "-fuse-ld=gold" ;
92
92
} ;
93
93
Original file line number Diff line number Diff line change @@ -72,7 +72,7 @@ mkMesonLibrary (finalAttrs: {
72
72
# https://github.com/NixOS/nixpkgs/issues/86131.
73
73
BOOST_INCLUDEDIR = "${ lib . getDev boost } /include" ;
74
74
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 ) ) {
76
76
LDFLAGS = "-fuse-ld=gold" ;
77
77
} ;
78
78
Original file line number Diff line number Diff line change @@ -99,7 +99,7 @@ mkMesonExecutable (finalAttrs: {
99
99
mesonFlags = [
100
100
] ;
101
101
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 ) ) {
103
103
LDFLAGS = "-fuse-ld=gold" ;
104
104
} ;
105
105
You can’t perform that action at this time.
0 commit comments