diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-10-15 06:07:54 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-10-15 06:07:54 +0000 |
commit | 4f07e7f326780b00020e1cfd57e216d10e5526e4 (patch) | |
tree | e31d650939268c2a2a3bd9d8af292dbcdc82b305 /pkgs/data | |
parent | 886633ba433d947a05ff2275ccf019b1e820debe (diff) | |
parent | 5b04d5b51b2695e7bcd05d5dcb8ce5eda0d0150c (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/data')
-rw-r--r-- | pkgs/data/fonts/cherry/default.nix | 4 | ||||
-rw-r--r-- | pkgs/data/fonts/clearlyU/default.nix | 4 | ||||
-rw-r--r-- | pkgs/data/fonts/creep/default.nix | 4 | ||||
-rw-r--r-- | pkgs/data/fonts/dina/default.nix | 4 | ||||
-rw-r--r-- | pkgs/data/fonts/envypn-font/default.nix | 4 | ||||
-rw-r--r-- | pkgs/data/fonts/gohufont/default.nix | 8 | ||||
-rw-r--r-- | pkgs/data/fonts/profont/default.nix | 4 | ||||
-rw-r--r-- | pkgs/data/fonts/siji/default.nix | 4 | ||||
-rw-r--r-- | pkgs/data/fonts/spleen/default.nix | 4 | ||||
-rw-r--r-- | pkgs/data/fonts/tamsyn/default.nix | 4 | ||||
-rw-r--r-- | pkgs/data/fonts/tamzen/default.nix | 4 | ||||
-rw-r--r-- | pkgs/data/fonts/terminus-font/default.nix | 4 | ||||
-rw-r--r-- | pkgs/data/fonts/tewi/default.nix | 8 | ||||
-rw-r--r-- | pkgs/data/fonts/ucs-fonts/default.nix | 6 | ||||
-rw-r--r-- | pkgs/data/fonts/uni-vga/default.nix | 4 | ||||
-rw-r--r-- | pkgs/data/fonts/unifont/default.nix | 6 | ||||
-rw-r--r-- | pkgs/data/fonts/uw-ttyp0/default.nix | 5 |
17 files changed, 40 insertions, 41 deletions
diff --git a/pkgs/data/fonts/cherry/default.nix b/pkgs/data/fonts/cherry/default.nix index 53d9149091e80..2e95777515510 100644 --- a/pkgs/data/fonts/cherry/default.nix +++ b/pkgs/data/fonts/cherry/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fonttosfnt, mkfontdir }: +{ lib, stdenv, fetchFromGitHub, xorg }: stdenv.mkDerivation rec { pname = "cherry"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "13zkxwp6r6kcxv4x459vwscr0n0sik4a3kcz5xnmlpvcdnbxi586"; }; - nativeBuildInputs = [ fonttosfnt mkfontdir ]; + nativeBuildInputs = [ xorg.fonttosfnt xorg.mkfontdir ]; buildPhase = '' patchShebangs make.sh diff --git a/pkgs/data/fonts/clearlyU/default.nix b/pkgs/data/fonts/clearlyU/default.nix index 5c97d3b713445..9799955d05f38 100644 --- a/pkgs/data/fonts/clearlyU/default.nix +++ b/pkgs/data/fonts/clearlyU/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fonttosfnt, mkfontscale, libfaketime }: +{ lib, stdenv, fetchurl, xorg, libfaketime }: stdenv.mkDerivation rec { pname = "clearlyU"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1xn14jbv3m1khy7ydvad9ydkn7yygdbhjy9wm1v000jzjwr3lv21"; }; - nativeBuildInputs = [ fonttosfnt mkfontscale libfaketime ]; + nativeBuildInputs = [ xorg.fonttosfnt xorg.mkfontscale libfaketime ]; buildPhase = '' # convert bdf fonts to otb diff --git a/pkgs/data/fonts/creep/default.nix b/pkgs/data/fonts/creep/default.nix index d4748544af555..d25464da813fa 100644 --- a/pkgs/data/fonts/creep/default.nix +++ b/pkgs/data/fonts/creep/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, libfaketime -, fonttosfnt, mkfontscale +, xorg }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0zs21kznh1q883jfdgz74bb63i4lxlv98hj3ipp0wvsi6zw0vs8n"; }; - nativeBuildInputs = [ libfaketime fonttosfnt mkfontscale ]; + nativeBuildInputs = [ libfaketime xorg.fonttosfnt xorg.mkfontscale ]; buildPhase = '' faketime -f "1970-01-01 00:00:01" fonttosfnt -g 2 -m 2 -o creep.otb creep.bdf diff --git a/pkgs/data/fonts/dina/default.nix b/pkgs/data/fonts/dina/default.nix index 3b5d75acb5039..509a37556cecc 100644 --- a/pkgs/data/fonts/dina/default.nix +++ b/pkgs/data/fonts/dina/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, unzip -, bdftopcf, mkfontscale, fonttosfnt +, bdftopcf, xorg }: stdenv.mkDerivation { @@ -14,7 +14,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = - [ unzip bdftopcf mkfontscale fonttosfnt ]; + [ unzip bdftopcf xorg.mkfontscale xorg.fonttosfnt ]; postPatch = '' sed -i 's/microsoft-cp1252/ISO8859-1/' *.bdf diff --git a/pkgs/data/fonts/envypn-font/default.nix b/pkgs/data/fonts/envypn-font/default.nix index dbfb85f881fc7..b80067baff058 100644 --- a/pkgs/data/fonts/envypn-font/default.nix +++ b/pkgs/data/fonts/envypn-font/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, libfaketime -, fonttosfnt, mkfontscale +, xorg }: stdenv.mkDerivation { @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "bda67b6bc6d5d871a4d46565d4126729dfb8a0de9611dae6c68132a7b7db1270"; }; - nativeBuildInputs = [ libfaketime fonttosfnt mkfontscale ]; + nativeBuildInputs = [ libfaketime xorg.fonttosfnt xorg.mkfontscale ]; unpackPhase = '' tar -xzf $src --strip-components=1 diff --git a/pkgs/data/fonts/gohufont/default.nix b/pkgs/data/fonts/gohufont/default.nix index e72bed4ae4103..37fb622e13105 100644 --- a/pkgs/data/fonts/gohufont/default.nix +++ b/pkgs/data/fonts/gohufont/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, fetchFromGitHub -, mkfontscale, bdf2psf, bdftopcf -, fonttosfnt, libfaketime +, xorg, bdf2psf, bdftopcf +, libfaketime }: stdenv.mkDerivation rec { @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = - [ mkfontscale bdf2psf bdftopcf - fonttosfnt libfaketime + [ xorg.mkfontscale bdf2psf bdftopcf + xorg.fonttosfnt libfaketime ]; buildPhase = '' diff --git a/pkgs/data/fonts/profont/default.nix b/pkgs/data/fonts/profont/default.nix index 3570bf7bf91ad..da12347af0626 100644 --- a/pkgs/data/fonts/profont/default.nix +++ b/pkgs/data/fonts/profont/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip, mkfontscale }: +{ lib, stdenv, fetchzip, xorg }: stdenv.mkDerivation { pname = "profont"; @@ -20,7 +20,7 @@ stdenv.mkDerivation { dontBuild = true; - nativeBuildInputs = [ mkfontscale ]; + nativeBuildInputs = [ xorg.mkfontscale ]; installPhase = '' mkdir -p "$out/share/fonts/misc" diff --git a/pkgs/data/fonts/siji/default.nix b/pkgs/data/fonts/siji/default.nix index adc6a79f10f49..e83c79cca5f4c 100644 --- a/pkgs/data/fonts/siji/default.nix +++ b/pkgs/data/fonts/siji/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, libfaketime, fonttosfnt, mkfontscale }: +{ lib, stdenv, fetchFromGitHub, libfaketime, xorg }: stdenv.mkDerivation rec { name = "siji-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1408g4nxwdd682vjqpmgv0cp0bfnzzzwls62cjs9zrds16xa9dpf"; }; - nativeBuildInputs = [ libfaketime fonttosfnt mkfontscale ]; + nativeBuildInputs = [ libfaketime xorg.fonttosfnt xorg.mkfontscale ]; buildPhase = '' # compress pcf fonts diff --git a/pkgs/data/fonts/spleen/default.nix b/pkgs/data/fonts/spleen/default.nix index 162197006ba76..737a799438fc7 100644 --- a/pkgs/data/fonts/spleen/default.nix +++ b/pkgs/data/fonts/spleen/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, mkfontscale }: +{ lib, fetchurl, xorg }: let pname = "spleen"; @@ -17,7 +17,7 @@ in fetchurl { install -m644 fonts.alias-spleen $d/fonts.alias # create fonts.dir so NixOS xorg module adds to fp - ${mkfontscale}/bin/mkfontdir "$d" + ${xorg.mkfontscale}/bin/mkfontdir "$d" ''; sha256 = "sha256-6Imsa0ku8On63di0DOo0QxBa0t+tbtPRxM531EIiG94="; diff --git a/pkgs/data/fonts/tamsyn/default.nix b/pkgs/data/fonts/tamsyn/default.nix index 6f0886e1d971f..64955efd62e82 100644 --- a/pkgs/data/fonts/tamsyn/default.nix +++ b/pkgs/data/fonts/tamsyn/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fontforge, mkfontscale }: +{ lib, stdenv, fetchurl, fontforge, xorg }: let version = "1.11"; @@ -11,7 +11,7 @@ in stdenv.mkDerivation { sha256 = "0kpjzdj8sv5871b8827mjgj9dswk75h94jj5iia2bds18ih1pglp"; }; - nativeBuildInputs = [ fontforge mkfontscale ]; + nativeBuildInputs = [ fontforge xorg.mkfontscale ]; unpackPhase = '' tar -xzf $src --strip-components=1 diff --git a/pkgs/data/fonts/tamzen/default.nix b/pkgs/data/fonts/tamzen/default.nix index 80212a14aebfb..8fcfe694299a7 100644 --- a/pkgs/data/fonts/tamzen/default.nix +++ b/pkgs/data/fonts/tamzen/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, mkfontscale, lib, stdenv }: +{ fetchFromGitHub, xorg, lib, stdenv }: stdenv.mkDerivation rec { pname = "tamzen-font"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "00x5fipzqimglvshhqwycdhaqslbvn3rl06jnswhyxfvz16ymj7s"; }; - nativeBuildInputs = [ mkfontscale ]; + nativeBuildInputs = [ xorg.mkfontscale ]; installPhase = '' install -m 644 -D otb/*.otb pcf/*.pcf -t "$out/share/fonts/misc" diff --git a/pkgs/data/fonts/terminus-font/default.nix b/pkgs/data/fonts/terminus-font/default.nix index 9ccf0371f1929..348f341cea50a 100644 --- a/pkgs/data/fonts/terminus-font/default.nix +++ b/pkgs/data/fonts/terminus-font/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, python3 -, bdftopcf, mkfontscale +, bdftopcf, xorg }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { patches = [ ./SOURCE_DATE_EPOCH-for-otb.patch ]; nativeBuildInputs = - [ python3 bdftopcf mkfontscale ]; + [ python3 bdftopcf xorg.mkfontscale ]; enableParallelBuilding = true; diff --git a/pkgs/data/fonts/tewi/default.nix b/pkgs/data/fonts/tewi/default.nix index 1cf31b5affe76..3e68042631c70 100644 --- a/pkgs/data/fonts/tewi/default.nix +++ b/pkgs/data/fonts/tewi/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, python3 -, bdftopcf, mkfontscale -, libfaketime, fonttosfnt +, bdftopcf, xorg +, libfaketime, }: stdenv.mkDerivation rec { @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = - [ python3 bdftopcf mkfontscale - libfaketime fonttosfnt + [ python3 bdftopcf xorg.mkfontscale + libfaketime xorg.fonttosfnt ]; postPatch = '' diff --git a/pkgs/data/fonts/ucs-fonts/default.nix b/pkgs/data/fonts/ucs-fonts/default.nix index 7bb9930ccfca9..e9d78dd03a7c8 100644 --- a/pkgs/data/fonts/ucs-fonts/default.nix +++ b/pkgs/data/fonts/ucs-fonts/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, bdftopcf -, libfaketime, fonttosfnt, mkfontscale +, libfaketime, xorg }: stdenv.mkDerivation { @@ -24,8 +24,8 @@ stdenv.mkDerivation { sourceRoot = "."; nativeBuildInputs = - [ bdftopcf libfaketime fonttosfnt - mkfontscale + [ bdftopcf libfaketime xorg.fonttosfnt + xorg.mkfontscale ]; buildPhase = '' diff --git a/pkgs/data/fonts/uni-vga/default.nix b/pkgs/data/fonts/uni-vga/default.nix index fea90e8b8e760..1239b12388310 100644 --- a/pkgs/data/fonts/uni-vga/default.nix +++ b/pkgs/data/fonts/uni-vga/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, perl, kbd, bdftopcf -, libfaketime, fonttosfnt, mkfontscale +, libfaketime, xorg }: stdenv.mkDerivation { @@ -12,7 +12,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ bdftopcf libfaketime - fonttosfnt mkfontscale + xorg.fonttosfnt xorg.mkfontscale ] ++ lib.optionals stdenv.isLinux [ perl kbd ]; postPatch = "patchShebangs ."; diff --git a/pkgs/data/fonts/unifont/default.nix b/pkgs/data/fonts/unifont/default.nix index 03ec6092ad1a2..1cd20a1c189b1 100644 --- a/pkgs/data/fonts/unifont/default.nix +++ b/pkgs/data/fonts/unifont/default.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, fetchurl, mkfontscale -, libfaketime, fonttosfnt +{ lib, stdenv, fetchurl, xorg +, libfaketime }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { hash = "sha256-77rkcU0YajAVugWHnGscaFvcFTgWm+1WPLknQZvTjN0="; }; - nativeBuildInputs = [ libfaketime fonttosfnt mkfontscale ]; + nativeBuildInputs = [ libfaketime xorg.fonttosfnt xorg.mkfontscale ]; dontUnpack = true; diff --git a/pkgs/data/fonts/uw-ttyp0/default.nix b/pkgs/data/fonts/uw-ttyp0/default.nix index a3c3f7b68aa74..f8006516e2763 100644 --- a/pkgs/data/fonts/uw-ttyp0/default.nix +++ b/pkgs/data/fonts/uw-ttyp0/default.nix @@ -1,6 +1,5 @@ { lib, stdenv, fetchurl, perl -, bdftopcf, bdf2psf, mkfontdir -, fonttosfnt +, bdftopcf, bdf2psf, xorg , targetsDat ? null , variantsDat ? null }: @@ -17,7 +16,7 @@ stdenv.mkDerivation rec { # remove for version >1.3 patches = [ ./determinism.patch ]; - nativeBuildInputs = [ perl bdftopcf bdf2psf fonttosfnt mkfontdir ]; + nativeBuildInputs = [ perl bdftopcf bdf2psf xorg.fonttosfnt xorg.mkfontdir ]; # configure sizes, encodings and variants preConfigure = |