From a4f81e1dbbb919edcaae495405a4969495a4b74d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 4 Oct 2022 15:52:09 +0200 Subject: [PATCH] Revert "ubuntu-font-family: use mkDerivation" This reverts commit 73e9cb6a78edb3e2d6c460688554e8afcad61d32. --- .../data/fonts/ubuntu-font-family/default.nix | 28 ++++++++----------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/pkgs/data/fonts/ubuntu-font-family/default.nix b/pkgs/data/fonts/ubuntu-font-family/default.nix index 4e29f23a158d..0f1d5b5a4cc0 100644 --- a/pkgs/data/fonts/ubuntu-font-family/default.nix +++ b/pkgs/data/fonts/ubuntu-font-family/default.nix @@ -1,30 +1,26 @@ -{ lib, stdenv, fetchzip }: +{ lib, fetchzip }: -stdenv.mkDerivation rec { - pname = "ubuntu-font-family"; - version = "0.83"; +fetchzip { + name = "ubuntu-font-family-0.83"; - src = fetchzip { - url = "https://assets.ubuntu.com/v1/fad7939b-${pname}-${version}.zip"; - hash = "sha256-FAg1xn8Gcbwmuvqtg9SquSet4oTT9nqE+Izeq7ZMVcA="; - }; + url = "https://assets.ubuntu.com/v1/fad7939b-ubuntu-font-family-0.83.zip"; - installPhase = '' - install -D -m 644 -t "$out/share/fonts/truetype" *.ttf + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/ubuntu ''; - outputHashMode = "recursive"; - outputHash = "sha256-EEcYtOeOd2DKyRLo1kG7lk8euaFilCFMXMJNAosxHiQ="; + sha256 = "090y665h4kf2bi623532l6wiwkwnpd0xds0jr7560xwfwys1hiqh"; - meta = with lib; { + meta = { description = "Ubuntu Font Family"; longDescription = "The Ubuntu typeface has been specially created to complement the Ubuntu tone of voice. It has a contemporary style and contains characteristics unique to the Ubuntu brand that convey a precise, reliable and free attitude."; homepage = "http://font.ubuntu.com/"; - license = licenses.free; - platforms = platforms.all; - maintainers = with maintainers; [ antono ]; + license = lib.licenses.free; + platforms = lib.platforms.all; + maintainers = [ lib.maintainers.antono ]; }; }