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

Merge pull request #95907 from rnhmjoj/otb-merge

Browse Source 
pkgs/data/fonts: merge back the split otb output
This commit is contained in:
Michael Raskin 2020-08-23 21:46:01 +00:00 committed by GitHub
commit f467d79b92
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 25 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/data/fonts/clearlyU/default.nix
View File

@ -20,19 +20,12 @@ stdenv.mkDerivation rec {
'';
installPhase = ''
# install bdf fonts
# install otb and bdf fonts
fontDir="$out/share/fonts"
install -m 644 -D *.bdf -t "$fontDir"
mkfontdir "$fontDir"
# install otb fonts
fontDir="$otb/share/fonts"
install -m 644 -D *.otb -t "$fontDir"
install -m 644 -D *.bdf *.otb -t "$fontDir"
mkfontdir "$fontDir"
'';
outputs = [ "out" "otb" ];
meta = with stdenv.lib; {
description = "A Unicode font";
license = licenses.mit;

6
pkgs/data/fonts/creep/default.nix
View File

@ -20,14 +20,10 @@ stdenv.mkDerivation rec {
'';
installPhase = ''
install -D -m644 creep.bdf "$out/share/fonts/misc/creep.bdf"
install -D -m644 creep.otb creep.bdf -t "$out/share/fonts/misc/"
mkfontdir "$out/share/fonts/misc"
install -D -m644 creep.otb "$otb/share/fonts/misc/creep.otb"
mkfontdir "$otb/share/fonts/misc"
'';
outputs = [ "out" "otb" ];
meta = with stdenv.lib; {
description = "A pretty sweet 4px wide pixel font";
homepage = "https://github.com/romeovs/creep";

6
pkgs/data/fonts/dina/default.nix
View File

@ -41,15 +41,13 @@ stdenv.mkDerivation {
'';
installPhase = ''
install -D -m 644 -t "$out/share/fonts/misc" *.pcf.gz
install -D -m 644 -t "$out/share/fonts/misc" *.pcf.gz *.otb
install -D -m 644 -t "$bdf/share/fonts/misc" *.bdf
install -D -m 644 -t "$otb/share/fonts/misc" *.otb
mkfontdir "$out/share/fonts/misc"
mkfontdir "$bdf/share/fonts/misc"
mkfontdir "$otb/share/fonts/misc"
'';
outputs = [ "out" "bdf" "otb" ];
outputs = [ "out" "bdf" ];
meta = with stdenv.lib; {
description = "A monospace bitmap font aimed at programmers";

6
pkgs/data/fonts/envypn-font/default.nix
View File

@ -25,14 +25,10 @@ stdenv.mkDerivation {
'';
installPhase = ''
install -D -m 644 -t "$out/share/fonts/misc" *.pcf.gz
install -D -m 644 -t "$otb/share/fonts/misc" *.otb
install -D -m 644 -t "$out/share/fonts/misc" *.otb *.pcf.gz
mkfontdir "$out/share/fonts/misc"
mkfontdir "$otb/share/fonts/misc"
'';
outputs = [ "out" "otb" ];
meta = with stdenv.lib; {
description = ''
Readable bitmap font inspired by Envy Code R

11
pkgs/data/fonts/gohufont/default.nix
View File

@ -52,19 +52,12 @@ stdenv.mkDerivation rec {
fontDir="$out/share/consolefonts"
install -D -m 644 -t "$fontDir" psf/*.psf
# install the pcf fonts (for xorg applications)
# install the pcf and otb fonts (for X11,GTK applications)
fontDir="$out/share/fonts/misc"
install -D -m 644 -t "$fontDir" *.pcf
mkfontdir "$fontDir"
# install the otb fonts (for gtk applications)
fontDir="$otb/share/fonts/misc"
install -D -m 644 -t "$fontDir" *.otb
install -D -m 644 -t "$fontDir" *.pcf *.otb
mkfontdir "$fontDir"
'';
outputs = [ "out" "otb" ];
meta = with stdenv.lib; {
description = ''
A monospace bitmap font well suited for programming and terminal use

7
pkgs/data/fonts/profont/default.nix
View File

@ -28,15 +28,10 @@ stdenv.mkDerivation {
gzip -n -9 -c "$f" > "$out/share/fonts/misc/$f.gz"
done
install -D -m 644 LICENSE -t "$out/share/doc/$pname"
install -D -m 644 "$srcOtb/profontn.otb" -t $out/share/fonts/misc
mkfontdir "$out/share/fonts/misc"
cd $srcOtb
install -D -m 644 profontn.otb -t $otb/share/fonts/misc
mkfontdir "$otb/share/fonts/misc"
'';
outputs = [ "out" "otb" ];
meta = with stdenv.lib; {
homepage = "https://tobiasjung.name/profont/";
description = "A monospaced font created to be a most readable font for programming";

6
pkgs/data/fonts/siji/default.nix
View File

@ -24,15 +24,13 @@ stdenv.mkDerivation rec {
'';
postInstall = ''
install -m 644 -D pcf/* -t "$out/share/fonts/misc"
install -m 644 -D *.otb pcf/* -t "$out/share/fonts/misc"
install -m 644 -D bdf/* -t "$bdf/share/fonts/misc"
install -m 644 -D *.otb -t "$otb/share/fonts/misc"
mkfontdir "$out/share/fonts/misc"
mkfontdir "$bdf/share/fonts/misc"
mkfontdir "$otb/share/fonts/misc"
'';
outputs = [ "out" "bdf" "otb" ];
outputs = [ "out" "bdf" ];
meta = with stdenv.lib; {
homepage = "https://github.com/stark/siji";

6
pkgs/data/fonts/tamsyn/default.nix
View File

@ -29,15 +29,11 @@ in stdenv.mkDerivation {
'';
installPhase = ''
install -m 644 -D *.pcf.gz -t "$out/share/fonts/misc"
install -m 644 -D *.otb *.pcf.gz -t "$out/share/fonts/misc"
install -m 644 -D *.psf.gz -t "$out/share/consolefonts"
install -m 644 -D *.otb -t "$otb/share/fonts/misc"
mkfontdir "$out/share/fonts/misc"
mkfontdir "$otb/share/fonts/misc"
'';
outputs = [ "out" "otb" ];
meta = with stdenv.lib; {
description = "A monospace bitmap font aimed at programmers";
longDescription = ''Tamsyn is a monospace bitmap font, primarily aimed at

6
pkgs/data/fonts/tamzen/default.nix
View File

@ -14,15 +14,11 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ mkfontscale ];
installPhase = ''
install -m 644 -D pcf/*.pcf -t "$out/share/fonts/misc"
install -m 644 -D otb/*.otb pcf/*.pcf -t "$out/share/fonts/misc"
install -m 644 -D psf/*.psf -t "$out/share/consolefonts"
install -m 644 -D otb/*.otb -t "$otb/share/fonts/misc"
mkfontdir "$out/share/fonts/misc"
mkfontdir "$otb/share/fonts/misc"
'';
outputs = [ "out" "otb" ];
meta = with stdenv.lib; {
description = "Bitmapped programming font based on Tamsyn";
longDescription = ''

6
pkgs/data/fonts/terminus-font/default.nix
View File

@ -35,14 +35,12 @@ stdenv.mkDerivation rec {
postInstall = ''
# install otb fonts (for GTK applications)
install -m 644 -D *.otb -t "$otb/share/fonts/misc";
mkfontdir "$otb/share/fonts/misc"
install -m 644 -D *.otb -t "$out/share/fonts/misc";
mkfontdir "$out/share/fonts/misc"
'';
installTargets = [ "install" "fontdir" ];
outputs = [ "out" "otb" ];
meta = with stdenv.lib; {
description = "A clean fixed width font";
longDescription = ''

8
pkgs/data/fonts/tewi/default.nix
View File

@ -38,16 +38,10 @@ stdenv.mkDerivation rec {
installPhase = ''
fontDir="$out/share/fonts/misc"
install -m 644 -D out/* -t "$fontDir"
mkfontdir "$fontDir"
fontDir="$otb/share/fonts/misc"
install -m 644 -D *.otb -t "$fontDir"
install -m 644 -D *.otb out/* -t "$fontDir"
mkfontdir "$fontDir"
'';
outputs = [ "out" "otb" ];
meta = with stdenv.lib; {
description = "A nice bitmap font, readable even at small sizes";
longDescription = ''

8
pkgs/data/fonts/ucs-fonts/default.nix
View File

@ -42,16 +42,14 @@ stdenv.mkDerivation {
'';
installPhase = ''
install -m 644 -D *.pcf.gz -t "$out/share/fonts/misc"
install -m 644 -D *.bdf -t "$bdf/share/fonts/misc"
install -m 644 -D *.otb -t "$otb/share/fonts/misc"
install -m 644 -D *.otb *.pcf.gz -t "$out/share/fonts/misc"
install -m 644 -D *.bdf -t "$bdf/share/fonts/misc"
mkfontdir "$out/share/fonts/misc"
mkfontdir "$bdf/share/fonts/misc"
mkfontdir "$otb/share/fonts/misc"
'';
outputs = [ "out" "bdf" "otb" ];
outputs = [ "out" "bdf" ];
meta = with stdenv.lib; {
homepage = "https://www.cl.cam.ac.uk/~mgk25/ucs-fonts.html";

9
pkgs/data/fonts/uni-vga/default.nix
View File

@ -34,23 +34,20 @@ stdenv.mkDerivation {
'';
installPhase = ''
# install pcf (for X11 applications)
install -m 644 -D *.pcf.gz -t "$out/share/fonts"
# install pcf and otb (for X11 and GTK applications)
install -m 644 -D *.otb *.pcf.gz -t "$out/share/fonts"
mkfontdir "$out/share/fonts"
# install bdf font
install -m 644 -D *.bdf -t "$bdf/share/fonts"
mkfontdir "$bdf/share/fonts"
# install otb font (for GTK applications)
install -m 644 -D *.otb -t "$otb/share/fonts"
mkfontdir "$otb/share/fonts"
'' + optionalString stdenv.isLinux ''
# install psf (for linux virtual terminal)
install -m 644 -D *.psf.gz -t "$out/share/consolefonts"
'';
outputs = [ "out" "bdf" "otb" ];
outputs = [ "out" "bdf" ];
meta = {
description = "Unicode VGA font";

6
pkgs/data/fonts/unifont/default.nix
View File

@ -30,8 +30,8 @@ stdenv.mkDerivation rec {
installPhase =
''
# install otb fonts
install -m 644 -D unifont.otb "$otb/share/fonts/unifont.otb"
mkfontdir "$otb/share/fonts"
install -m 644 -D unifont.otb "$out/share/fonts/unifont.otb"
mkfontdir "$out/share/fonts"
# install pcf and ttf fonts
install -m 644 -D ${pcf} $out/share/fonts/unifont.pcf.gz
@ -41,8 +41,6 @@ stdenv.mkDerivation rec {
mkfontscale
'';
outputs = [ "out" "otb" ];
meta = with stdenv.lib; {
description = "Unicode font for Base Multilingual Plane";
homepage = "http://unifoundry.com/unifont.html";

4
pkgs/data/fonts/uw-ttyp0/default.nix
View File

@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
install -m 644 -D psf/*.psf -t "$fontDir"
# install otb fonts
fontDir="$otb/share/fonts/X11/misc"
fontDir="$out/share/fonts/X11/misc"
install -m 644 -D otb/*.otb -t "$fontDir"
mkfontdir "$fontDir"
'';
@ -80,8 +80,6 @@ stdenv.mkDerivation rec {
runHook postConfigure
'';
outputs = [ "out" "otb" ];
meta = with stdenv.lib; {
description = "Monospace bitmap screen fonts for X11";
homepage = "https://people.mpi-inf.mpg.de/~uwe/misc/uw-ttyp0/";