Unverified Commit 91b5a18f authored by Maciej Krüger's avatar Maciej Krüger Committed by GitHub
Browse files

Merge pull request #263009 from nbraud/pkgs/google-fonts

parents 333acde7 feb7cafb
Loading
Loading
Loading
Loading
+5 −3
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@

stdenvNoCC.mkDerivation {
  pname = "google-fonts";
  version = "unstable-2022-11-14";
  version = "unstable-2023-10-20";

  # Adobe Blank is split out in a separate output,
  # because it causes crashes with `libfontconfig`.
@@ -16,8 +16,8 @@ stdenvNoCC.mkDerivation {
  src = fetchFromGitHub {
    owner = "google";
    repo = "fonts";
    rev = "83e116a566eda04a2469a11ee562cef1d7b33e4f";
    sha256 = "sha256-sSabk+VWkoXj1Nzv9ufgIU/nkfKf4XkZU1SO+j+eSPA=";
    rev = "990be3ed8f77e31c26bf07b148d6a74b8e6241cf";
    sha256 = "sha256-ffLXzaniHkWxGQpvlJpiO6/SAdbI3FONgTaq8Xu+WY0=";
  };

  postPatch = ''
@@ -29,6 +29,7 @@ stdenvNoCC.mkDerivation {
    rm -rv ofl/cabincondensed \
      ofl/signikanegative \
      ofl/signikanegativesc \
      ofl/*_todelist \
      axisregistry/tests/data

    if find . -name "*.ttf" | sed 's|.*/||' | sort | uniq -c | sort -n | grep -v '^.*1 '; then
@@ -67,5 +68,6 @@ stdenvNoCC.mkDerivation {
    platforms = platforms.all;
    hydraPlatforms = [];
    maintainers = with maintainers; [ manveru ];
    sourceProvenance = [ sourceTypes.binaryBytecode ];
  };
}