JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rustc: fix for structured attrs

Browse Source
This commit is contained in:
Maximilian Bosch 2019-11-13 14:17:33 +01:00 committed by Jan Tojnar
parent b92fc0fba4
commit 823b96a52b
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/compilers/rust/rustc.nix
View File

@ -9,7 +9,7 @@
}:
let
inherit (stdenv.lib) optional optionalString;
inherit (stdenv.lib) optionals optional optionalString;
inherit (darwin.apple_sdk.frameworks) Security;
llvmSharedForBuild = pkgsBuildBuild.llvm_9.override { enableSharedLibraries = true; };
@ -83,12 +83,12 @@ in stdenv.mkDerivation rec {
"${setBuild}.cxx=${cxxForBuild}"
"${setHost}.cxx=${cxxForHost}"
"${setTarget}.cxx=${cxxForTarget}"
] ++ optional (!withBundledLLVM) [
] ++ optionals (!withBundledLLVM) [
"--enable-llvm-link-shared"
"${setBuild}.llvm-config=${llvmSharedForBuild}/bin/llvm-config"
"${setHost}.llvm-config=${llvmSharedForHost}/bin/llvm-config"
"${setTarget}.llvm-config=${llvmSharedForTarget}/bin/llvm-config"
] ++ optional stdenv.isLinux [
] ++ optionals stdenv.isLinux [
"--enable-profiler" # build libprofiler_builtins
];