jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

joypixels: Refactor to special-case darwin

Browse Source 
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.
This commit is contained in:
toonn 2020-08-09 20:10:54 +02:00 committed by Jan Tojnar
parent 25ca62c2a2
commit c5249d1e9d
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/data/fonts/joypixels/default.nix
View File

@ -4,8 +4,6 @@
let inherit (stdenv.hostPlatform) system; let inherit (stdenv.hostPlatform) system;
throwSystem = throw "Unsupported system: ${system}";
systemSpecific = { systemSpecific = {
x86_64-darwin = rec { x86_64-darwin = rec {
systemTag = "nix-darwin"; systemTag = "nix-darwin";
@ -14,14 +12,13 @@ let inherit (stdenv.hostPlatform) system;
fontFile = "Apple%20Color%20Emoji.ttc"; fontFile = "Apple%20Color%20Emoji.ttc";
name = "joypixels-apple-color-emoji.ttc"; name = "joypixels-apple-color-emoji.ttc";
}; };
x86_64-linux = rec { }.${system} or rec {
systemTag = "nix-os"; systemTag = "nix-os";
capitalized = "NixOS"; capitalized = "NixOS";
ext = "ttf"; ext = "ttf";
fontFile = "joypixels-android.ttf"; fontFile = "joypixels-android.ttf";
name = fontFile; name = fontFile;
}; };
}.${system} or throwSystem;
joypixels-free-license = with systemSpecific; { joypixels-free-license = with systemSpecific; {
spdxId = "LicenseRef-JoyPixels-Free-6.0"; spdxId = "LicenseRef-JoyPixels-Free-6.0";
@ -59,8 +56,7 @@ stdenv.mkDerivation rec {
url = "https://cdn.joypixels.com/distributions/${systemTag}/font/${version}/${fontFile}"; url = "https://cdn.joypixels.com/distributions/${systemTag}/font/${version}/${fontFile}";
sha256 = { sha256 = {
x86_64-darwin = "043980g0dlp8vd4qkbx6298fwz8ns0iwbxm0f8czd9s7n2xm4npq"; x86_64-darwin = "043980g0dlp8vd4qkbx6298fwz8ns0iwbxm0f8czd9s7n2xm4npq";
x86_64-linux = "1vxqsqs93g4jyp01r47lrpcm0fmib2n1vysx32ksmfxmprimb75s"; }.${system} or "1vxqsqs93g4jyp01r47lrpcm0fmib2n1vysx32ksmfxmprimb75s";
}.${system} or throwSystem;
}; };
dontUnpack = true; dontUnpack = true;