From c5249d1e9da68cdaadb4dd98378e02a0bc7911c3 Mon Sep 17 00:00:00 2001 From: toonn Date: Sun, 9 Aug 2020 20:10:54 +0200 Subject: [PATCH] joypixels: Refactor to special-case darwin Specifying the system-specific variables for x86_64-darwin and x86_64-linux is too restrictive, excluding for example i686-linux. Since macOS seems to be the odd one out we can special-case only x86_64-darwin. --- pkgs/data/fonts/joypixels/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/data/fonts/joypixels/default.nix b/pkgs/data/fonts/joypixels/default.nix index 2b39595f0e1..fba838bb65b 100644 --- a/pkgs/data/fonts/joypixels/default.nix +++ b/pkgs/data/fonts/joypixels/default.nix @@ -4,8 +4,6 @@ let inherit (stdenv.hostPlatform) system; - throwSystem = throw "Unsupported system: ${system}"; - systemSpecific = { x86_64-darwin = rec { systemTag = "nix-darwin"; @@ -14,14 +12,13 @@ let inherit (stdenv.hostPlatform) system; fontFile = "Apple%20Color%20Emoji.ttc"; name = "joypixels-apple-color-emoji.ttc"; }; - x86_64-linux = rec { + }.${system} or rec { systemTag = "nix-os"; capitalized = "NixOS"; ext = "ttf"; fontFile = "joypixels-android.ttf"; name = fontFile; }; - }.${system} or throwSystem; joypixels-free-license = with systemSpecific; { spdxId = "LicenseRef-JoyPixels-Free-6.0"; @@ -59,8 +56,7 @@ stdenv.mkDerivation rec { url = "https://cdn.joypixels.com/distributions/${systemTag}/font/${version}/${fontFile}"; sha256 = { x86_64-darwin = "043980g0dlp8vd4qkbx6298fwz8ns0iwbxm0f8czd9s7n2xm4npq"; - x86_64-linux = "1vxqsqs93g4jyp01r47lrpcm0fmib2n1vysx32ksmfxmprimb75s"; - }.${system} or throwSystem; + }.${system} or "1vxqsqs93g4jyp01r47lrpcm0fmib2n1vysx32ksmfxmprimb75s"; }; dontUnpack = true;