additional to all fonts, provide a set with all fonts (fonts.all).

This commit is contained in:
Denis Knauf 2023-06-20 17:54:20 +02:00
parent d1d9d39f45
commit 8960e7db51
3 changed files with 54 additions and 51 deletions

View file

@ -4,7 +4,7 @@ with pkgs;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "fonts-collection"; name = "fonts-collection";
nativeBuildInputs = [ coreutils ]; nativeBuildInputs = [ coreutils ];
srcs = [ fonts.fira_code ];# lib.attrsets.attrValues fonts; srcs = builtins.attrValues fonts.all;
unpackPhase = " "; unpackPhase = " ";
installPhase = '' installPhase = ''
mkdir -p "$out/share/"{fonts,doc} mkdir -p "$out/share/"{fonts,doc}

View file

@ -1,6 +1,6 @@
# vim: set noet sw=2 ts=2 sts=2: # vim: set noet sw=2 ts=2 sts=2:
{lib, pkgs, ...}: {lib, pkgs, ...}:
{src ? null , srcs ? null, name ? "", pname ? "", version ? ""}: ({src ? null , srcs ? null, name ? "", pname ? "", version ? ""}:
with pkgs; with pkgs;
let let
name_ = name_ =
@ -88,4 +88,4 @@ in stdenv.mkDerivation ({
find "$source_dir" -name \*.html -exec cp \{\} $out/share/doc/${name_} \; find "$source_dir" -name \*.html -exec cp \{\} $out/share/doc/${name_} \;
find "$source_dir" -name \*.css -exec cp \{\} $out/share/doc/${name_} \; find "$source_dir" -name \*.css -exec cp \{\} $out/share/doc/${name_} \;
''; '';
} // (if null != src then { src = src; } else { srcs = srcs; })) } // (if null != src then { src = src; } else { srcs = srcs; })))

View file

@ -3,7 +3,7 @@
with pkgs; with pkgs;
let let
github = path: "https://github.com/${path}"; github = path: "https://github.com/${path}";
in { fonts = {
libre_barcode = libre_barcode =
fetchfont rec { fetchfont rec {
pname = "LibreBarcode"; pname = "LibreBarcode";
@ -40,15 +40,18 @@ in {
version = "3.000"; version = "3.000";
src = fetchurl { name = "${pname}-${version}.tar.gz"; hash = "sha256-8tjYumyqeFqWbvF5loIqsUupHsQjQxop4bbEsUvEzaU="; url = github "googlefonts/${pname}/archive/refs/tags/v${version}.tar.gz"; }; src = fetchurl { name = "${pname}-${version}.tar.gz"; hash = "sha256-8tjYumyqeFqWbvF5loIqsUupHsQjQxop4bbEsUvEzaU="; url = github "googlefonts/${pname}/archive/refs/tags/v${version}.tar.gz"; };
}; };
#rubik_dirt = rubik_dirt =
# fetchfont rec { fetchfont rec {
# pname = "RubikDirt"; pname = "RubikDirt";
# version = "2"; version = "2";
# srcs = srcs =
# let baseurl = github "NaN-xyz/Rubik-Filtered/raw/7f47b7f79f903e1d6af9883da43a84928e02b816/dirt/fonts"; let baseurl = github "NaN-xyz/Rubik-Filtered/raw/7f47b7f79f903e1d6af9883da43a84928e02b816/dirt/fonts";
# in [ in [
# (fetchurl { name = "${pname}-Regular.ttf"; hash = "sha256-nePZKOQ0pH7IXXWQEsig6/6rCGAHbupOOYmkfF4hMSM="; url = "${baseurl}/ttf/${pname}-Regular.ttf"; }) (fetchurl { name = "${pname}-Regular.ttf"; hash = "sha256-nePZKOQ0pH7IXXWQEsig6/6rCGAHbupOOYmkfF4hMSM="; url = "${baseurl}/ttf/${pname}-Regular.ttf"; })
# (fetchurl { name = "${pname}-Regular.woff2"; hash = "sha256-xh1jUaN5FRaU/omXT7U9T9Qhu+Cl/YddAJnSpgCOqYk="; url = "${baseurl}/webfonts/${pname}-Regular.woff2"; }) (fetchurl { name = "${pname}-Regular.woff2"; hash = "sha256-xh1jUaN5FRaU/omXT7U9T9Qhu+Cl/YddAJnSpgCOqYk="; url = "${baseurl}/webfonts/${pname}-Regular.woff2"; })
# ]; ];
# }; };
} };
in {
all = fonts;
} // fonts