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

font-awesome_4: Was removed, add again

Browse Source 
Version 5 is incompatible for some icons, so projects that depend on it
need to actively convert the symbols, see:
https://github.com/greshake/i3status-rust/issues/130

Reintroducing the old version lets us use those programs that haven't
been updated.

Was removed in 0a393f53a9702cea04a6afea506c3a91a1a2bf60
This commit is contained in:
Daniel Schaefer 2019-07-21 22:00:58 +02:00
parent e21cb9933b
commit da40bc4449
2 changed files with 39 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
pkgs/data/fonts/font-awesome-5/default.nix
View File

@ -1,20 +1,19 @@
{ lib, fetchFromGitHub }: { lib, fetchFromGitHub }:
let let
version = "5.9.0"; font-awesome = { version, sha256, rev ? version}: fetchFromGitHub rec {
in fetchFromGitHub rec {
name = "font-awesome-${version}"; name = "font-awesome-${version}";
owner = "FortAwesome"; owner = "FortAwesome";
repo = "Font-Awesome"; repo = "Font-Awesome";
rev = version; inherit rev;
postFetch = '' postFetch = ''
tar xf $downloadedFile --strip=1 tar xf $downloadedFile --strip=1
install -m444 -Dt $out/share/fonts/opentype otfs/*.otf install -m444 -Dt $out/share/fonts/opentype {fonts,otfs}/*.otf
''; '';
sha256 = "0sz7mn7g968vp5hszs05grpphd7zr3073az8lyy1lj0096zvjjii"; inherit sha256;
meta = with lib; { meta = with lib; {
description = "Font Awesome - OTF font"; description = "Font Awesome - OTF font";
@ -22,9 +21,25 @@ in fetchFromGitHub rec {
Font Awesome gives you scalable vector icons that can instantly be customized. Font Awesome gives you scalable vector icons that can instantly be customized.
This package includes only the OTF font. For full CSS etc. see the project website. This package includes only the OTF font. For full CSS etc. see the project website.
''; '';
homepage = http://fortawesome.github.io/Font-Awesome/; homepage = "http://fortawesome.github.io/Font-Awesome/";
license = licenses.ofl; license = licenses.ofl;
platforms = platforms.all; platforms = platforms.all;
maintainers = with maintainers; [ abaldeau ]; maintainers = with maintainers; [ abaldeau johnazoidberg ];
};
};
in {
# Keeping version 4 because version 5 is incompatible for some icons. That
# means that projects which depend on it need to actively convert the
# symbols. See:
# https://github.com/greshake/i3status-rust/issues/130
# https://fontawesome.com/how-to-use/on-the-web/setup/upgrading-from-version-4
v4 = font-awesome {
version = "4.7.0";
rev = "v4.7.0";
sha256 = "1j8i32dq6rrlv3kf2hnq81iqks06kczaxjks7nw3zyq1231winm9";
};
v5 = font-awesome {
version = "5.9.0";
sha256 = "0sz7mn7g968vp5hszs05grpphd7zr3073az8lyy1lj0096zvjjii";
}; };
} }

3
pkgs/top-level/all-packages.nix
View File

@ -16393,7 +16393,8 @@ in
fira-mono = callPackage ../data/fonts/fira-mono { }; fira-mono = callPackage ../data/fonts/fira-mono { };
font-awesome_5 = callPackage ../data/fonts/font-awesome-5 { }; font-awesome_4 = (callPackage ../data/fonts/font-awesome-5 { }).v4;
font-awesome_5 = (callPackage ../data/fonts/font-awesome-5 { }).v5;
font-awesome = font-awesome_5; font-awesome = font-awesome_5;
freefont_ttf = callPackage ../data/fonts/freefont-ttf { }; freefont_ttf = callPackage ../data/fonts/freefont-ttf { };