font-arabic-misc: refactor, move to pkgs/by-name and rename from xorg.fontarabicmisc

the package output doesn't change
This commit is contained in:
quantenzitrone
2025-11-16 00:32:09 +01:00
parent 1d4c88323a
commit 1c66cd8f65
4 changed files with 54 additions and 41 deletions
@@ -0,0 +1,50 @@
{
lib,
stdenv,
fetchurl,
pkg-config,
fontutil,
bdftopcf,
mkfontscale,
writeScript,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "font-arabic-misc";
version = "1.0.4";
src = fetchurl {
url = "mirror://xorg/individual/font/font-arabic-misc-${finalAttrs.version}.tar.xz";
hash = "sha256-Rv/mG1LHih0tynD/IKny2E1pdEY5yrmghcen7hdmNGc=";
};
strictDeps = true;
nativeBuildInputs = [
pkg-config
bdftopcf
mkfontscale
];
buildInputs = [ fontutil ];
configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
passthru = {
updateScript = writeScript "update-${finalAttrs.pname}" ''
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p common-updater-scripts
version="$(list-directory-versions --pname ${finalAttrs.pname} \
--url https://xorg.freedesktop.org/releases/individual/font/ \
| sort -V | tail -n1)"
update-source-version ${finalAttrs.pname} "$version"
'';
};
meta = {
description = "Arabic newspaper pcf font";
homepage = "https://gitlab.freedesktop.org/xorg/font/arabic-misc";
license = lib.licenses.mit;
maintainers = [ ];
platforms = lib.platforms.unix;
};
})
+2 -40
View File
@@ -9,6 +9,7 @@
font-adobe-utopia-75dpi,
font-adobe-utopia-type1,
font-alias,
font-arabic-misc,
font-bh-100dpi,
font-bh-75dpi,
font-bh-lucidatypewriter-100dpi,
@@ -213,6 +214,7 @@ self: with self; {
fontadobeutopia75dpi = font-adobe-utopia-75dpi;
fontadobeutopiatype1 = font-adobe-utopia-type1;
fontalias = font-alias;
fontarabicmisc = font-arabic-misc;
fontbh100dpi = font-bh-100dpi;
fontbh75dpi = font-bh-75dpi;
fontbhlucidatypewriter100dpi = font-bh-lucidatypewriter-100dpi;
@@ -382,46 +384,6 @@ self: with self; {
})
) { };
# THIS IS A GENERATED FILE. DO NOT EDIT!
fontarabicmisc = callPackage (
{
stdenv,
pkg-config,
fetchurl,
fontutil,
bdftopcf,
mkfontscale,
testers,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "font-arabic-misc";
version = "1.0.4";
builder = ./builder.sh;
src = fetchurl {
url = "mirror://xorg/individual/font/font-arabic-misc-1.0.4.tar.xz";
sha256 = "0rrlcqbyx9y7hnhbkjir8rs6jkfqyalj1zvhr8niv2n7a8dydzs6";
};
hardeningDisable = [
"bindnow"
"relro"
];
strictDeps = true;
nativeBuildInputs = [
pkg-config
bdftopcf
mkfontscale
];
buildInputs = [ fontutil ];
configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' '';
passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
meta = {
pkgConfigModules = [ ];
platforms = lib.platforms.unix;
};
})
) { };
# THIS IS A GENERATED FILE. DO NOT EDIT!
fontcursormisc = callPackage (
{
@@ -340,6 +340,7 @@ print OUT <<EOF;
font-adobe-utopia-75dpi,
font-adobe-utopia-type1,
font-alias,
font-arabic-misc,
font-bh-100dpi,
font-bh-75dpi,
font-bh-lucidatypewriter-100dpi,
@@ -544,6 +545,7 @@ self: with self; {
fontadobeutopia75dpi = font-adobe-utopia-75dpi;
fontadobeutopiatype1 = font-adobe-utopia-type1;
fontalias = font-alias;
fontarabicmisc = font-arabic-misc;
fontbh100dpi = font-bh-100dpi;
fontbh75dpi = font-bh-75dpi;
fontbhlucidatypewriter100dpi = font-bh-lucidatypewriter-100dpi;
-1
View File
@@ -68,7 +68,6 @@ mirror://xorg/individual/driver/xf86-video-vesa-2.6.0.tar.xz
mirror://xorg/individual/driver/xf86-video-vmware-13.4.0.tar.xz
mirror://xorg/individual/driver/xf86-video-voodoo-1.2.6.tar.xz
mirror://xorg/individual/driver/xf86-video-wsfb-0.4.0.tar.bz2
mirror://xorg/individual/font/font-arabic-misc-1.0.4.tar.xz
mirror://xorg/individual/font/font-cursor-misc-1.0.4.tar.xz
mirror://xorg/individual/font/font-daewoo-misc-1.0.4.tar.xz
mirror://xorg/individual/font/font-dec-misc-1.0.4.tar.xz