diff options
| author | Jonathan Ringer <jonringer117@gmail.com> | 2021-05-18 11:03:38 -0700 |
|---|---|---|
| committer | Jonathan Ringer <jonringer117@gmail.com> | 2021-05-18 11:03:38 -0700 |
| commit | ca46ad37626cf20530f3b502d28d6e44a6db648c (patch) | |
| tree | 12bff9fd2a2ca357a70fd5593f310dd7d152b6b1 /pkgs/tools/misc/silicon | |
| parent | f7a112f6c44b95d0af2954942fb10c39fdd478f8 (diff) | |
| parent | 6bebadb17152fcbc734ffb4fc49775bda0d1497a (diff) | |
| download | nixpkgs-ca46ad37626cf20530f3b502d28d6e44a6db648c.tar nixpkgs-ca46ad37626cf20530f3b502d28d6e44a6db648c.tar.gz nixpkgs-ca46ad37626cf20530f3b502d28d6e44a6db648c.tar.bz2 nixpkgs-ca46ad37626cf20530f3b502d28d6e44a6db648c.tar.lz nixpkgs-ca46ad37626cf20530f3b502d28d6e44a6db648c.tar.xz nixpkgs-ca46ad37626cf20530f3b502d28d6e44a6db648c.tar.zst nixpkgs-ca46ad37626cf20530f3b502d28d6e44a6db648c.zip | |
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts: pkgs/tools/package-management/cargo-release/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 123dc715546..d115997498b 100644 --- a/pkgs/tools/misc/silicon/default.nix +++ b/pkgs/tools/misc/silicon/default.nix @@ -9,6 +9,7 @@ , freetype , libxcb , python3 +, libiconv , AppKit , CoreText , Security @@ -29,7 +30,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ llvmPackages.libclang expat freetype ] ++ lib.optionals stdenv.isLinux [ libxcb ] - ++ lib.optionals stdenv.isDarwin [ AppKit CoreText Security ]; + ++ lib.optionals stdenv.isDarwin [ libiconv AppKit CoreText Security ]; nativeBuildInputs = [ cmake pkg-config ] ++ lib.optionals stdenv.isLinux [ python3 ]; |