diff options
author | Daniel Schaefer <git@danielschaefer.me> | 2019-07-21 22:00:58 +0200 |
---|---|---|
committer | Daniel Schaefer <git@danielschaefer.me> | 2019-07-30 00:05:52 +0200 |
commit | da40bc4449ad61363fc6cfcffe71b41094414e34 (patch) | |
tree | d15fdbe70517a944e8dc9b358918d6cbcd514757 | |
parent | e21cb9933be2dec8990b29ed388590067798dad6 (diff) | |
download | nixlib-da40bc4449ad61363fc6cfcffe71b41094414e34.tar nixlib-da40bc4449ad61363fc6cfcffe71b41094414e34.tar.gz nixlib-da40bc4449ad61363fc6cfcffe71b41094414e34.tar.bz2 nixlib-da40bc4449ad61363fc6cfcffe71b41094414e34.tar.lz nixlib-da40bc4449ad61363fc6cfcffe71b41094414e34.tar.xz nixlib-da40bc4449ad61363fc6cfcffe71b41094414e34.tar.zst nixlib-da40bc4449ad61363fc6cfcffe71b41094414e34.zip |
font-awesome_4: Was removed, add again
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
-rw-r--r-- | pkgs/data/fonts/font-awesome-5/default.nix | 59 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
2 files changed, 39 insertions, 23 deletions
diff --git a/pkgs/data/fonts/font-awesome-5/default.nix b/pkgs/data/fonts/font-awesome-5/default.nix index ee1365d26118..3579afc6da17 100644 --- a/pkgs/data/fonts/font-awesome-5/default.nix +++ b/pkgs/data/fonts/font-awesome-5/default.nix @@ -1,30 +1,45 @@ { lib, fetchFromGitHub }: - let - version = "5.9.0"; -in fetchFromGitHub rec { - name = "font-awesome-${version}"; - - owner = "FortAwesome"; - repo = "Font-Awesome"; - rev = version; + font-awesome = { version, sha256, rev ? version}: fetchFromGitHub rec { + name = "font-awesome-${version}"; - postFetch = '' - tar xf $downloadedFile --strip=1 - install -m444 -Dt $out/share/fonts/opentype otfs/*.otf - ''; - sha256 = "0sz7mn7g968vp5hszs05grpphd7zr3073az8lyy1lj0096zvjjii"; + owner = "FortAwesome"; + repo = "Font-Awesome"; + inherit rev; - meta = with lib; { - description = "Font Awesome - OTF font"; - longDescription = '' - 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. + postFetch = '' + tar xf $downloadedFile --strip=1 + install -m444 -Dt $out/share/fonts/opentype {fonts,otfs}/*.otf ''; - homepage = http://fortawesome.github.io/Font-Awesome/; - license = licenses.ofl; - platforms = platforms.all; - maintainers = with maintainers; [ abaldeau ]; + + inherit sha256; + + meta = with lib; { + description = "Font Awesome - OTF font"; + longDescription = '' + 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. + ''; + homepage = "http://fortawesome.github.io/Font-Awesome/"; + license = licenses.ofl; + platforms = platforms.all; + 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"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cf609b073b32..729f27f6c910 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16393,7 +16393,8 @@ in 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; freefont_ttf = callPackage ../data/fonts/freefont-ttf { }; |