diff options
| author | Jonathan Ringer <jonringer117@gmail.com> | 2021-05-19 10:39:54 -0700 |
|---|---|---|
| committer | Jonathan Ringer <jonringer117@gmail.com> | 2021-05-19 10:39:54 -0700 |
| commit | c1f8a15dac0f2b8709a5665dfc6c0c097456d4d5 (patch) | |
| tree | 70ac7436489403673c268f1020857c0e977bdc46 /pkgs/tools/misc/silicon | |
| parent | 7000ae2b9a6a6748e87cb11c9a7e314ba63202de (diff) | |
| parent | b73f621c259b1c4001afda6ba847b7333c7908db (diff) | |
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts: nixos/doc/manual/release-notes/rl-2105.xml pkgs/tools/security/sequoia/default.nix
Diffstat (limited to 'pkgs/tools/misc/silicon')
| -rw-r--r-- | pkgs/tools/misc/silicon/default.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/tools/misc/silicon/default.nix b/pkgs/tools/misc/silicon/default.nix index d115997498b31..ae58054511407 100644 --- a/pkgs/tools/misc/silicon/default.nix +++ b/pkgs/tools/misc/silicon/default.nix @@ -13,6 +13,7 @@ , AppKit , CoreText , Security +, fira-code }: rustPlatform.buildRustPackage rec { @@ -28,7 +29,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-sUPOf9er+BOMqDJ8C6+Xjjqj6NQUV2JTzGA4yUWtDWM="; - buildInputs = [ llvmPackages.libclang expat freetype ] + buildInputs = [ llvmPackages.libclang expat freetype fira-code ] ++ lib.optionals stdenv.isLinux [ libxcb ] ++ lib.optionals stdenv.isDarwin [ libiconv AppKit CoreText Security ]; |