diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2019-11-13 14:17:33 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-12-31 01:29:57 +0100 |
| commit | 823b96a52b28bfc1e3b7503e5f3c51346406acfa (patch) | |
| tree | 1dd0abbc07056f2dbb044ec4c9c2122028f1fe1d | |
| parent | b92fc0fba48a43ca13eccdc4cb8c8d6aada5b831 (diff) | |
| download | nixpkgs-823b96a52b28bfc1e3b7503e5f3c51346406acfa.tar nixpkgs-823b96a52b28bfc1e3b7503e5f3c51346406acfa.tar.gz nixpkgs-823b96a52b28bfc1e3b7503e5f3c51346406acfa.tar.bz2 nixpkgs-823b96a52b28bfc1e3b7503e5f3c51346406acfa.tar.lz nixpkgs-823b96a52b28bfc1e3b7503e5f3c51346406acfa.tar.xz nixpkgs-823b96a52b28bfc1e3b7503e5f3c51346406acfa.tar.zst nixpkgs-823b96a52b28bfc1e3b7503e5f3c51346406acfa.zip | |
rustc: fix for structured attrs
| -rw-r--r-- | pkgs/development/compilers/rust/rustc.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 44bbd05aec7..e5c8a709a90 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -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 ]; |