From f9f1cbbffa34e8486ec5df6d4413f68ec79388a3 Mon Sep 17 00:00:00 2001 From: toonn Date: Mon, 10 Aug 2020 10:39:26 +0200 Subject: [PATCH] joypixels: Switch on kernel.name rather than system x86_64-darwin is too specific because macOS runs on multiple architectures. --- pkgs/data/fonts/joypixels/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/data/fonts/joypixels/default.nix b/pkgs/data/fonts/joypixels/default.nix index fba838bb65b4..f4df27c70aa1 100644 --- a/pkgs/data/fonts/joypixels/default.nix +++ b/pkgs/data/fonts/joypixels/default.nix @@ -2,17 +2,17 @@ , acceptLicense ? config.joypixels.acceptLicense or false }: -let inherit (stdenv.hostPlatform) system; +let inherit (stdenv.hostPlatform.parsed) kernel; systemSpecific = { - x86_64-darwin = rec { + darwin = rec { systemTag = "nix-darwin"; capitalized = systemTag; ext = "ttc"; fontFile = "Apple%20Color%20Emoji.ttc"; name = "joypixels-apple-color-emoji.ttc"; }; - }.${system} or rec { + }.${kernel.name} or rec { systemTag = "nix-os"; capitalized = "NixOS"; ext = "ttf"; @@ -55,8 +55,8 @@ stdenv.mkDerivation rec { inherit name; url = "https://cdn.joypixels.com/distributions/${systemTag}/font/${version}/${fontFile}"; sha256 = { - x86_64-darwin = "043980g0dlp8vd4qkbx6298fwz8ns0iwbxm0f8czd9s7n2xm4npq"; - }.${system} or "1vxqsqs93g4jyp01r47lrpcm0fmib2n1vysx32ksmfxmprimb75s"; + darwin = "043980g0dlp8vd4qkbx6298fwz8ns0iwbxm0f8czd9s7n2xm4npq"; + }.${kernel.name} or "1vxqsqs93g4jyp01r47lrpcm0fmib2n1vysx32ksmfxmprimb75s"; }; dontUnpack = true;