font-encodings: refactor, move to pkgs/by-name and rename from xorg.encodings
relevant changes: - remove some unneeded dependencies
This commit is contained in:
@@ -0,0 +1,38 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
mkfontscale,
|
||||
writeScript,
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "font-encodings";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://xorg/individual/font/encodings-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-n/E8YhdWz6EulfMrpIpbI4Oej1d9AEi+2mbGfatN6XU=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
nativeBuildInputs = [ mkfontscale ];
|
||||
|
||||
passthru = {
|
||||
updateScript = writeScript "update-${finalAttrs.pname}" ''
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p common-updater-scripts
|
||||
version="$(list-directory-versions --pname encodings \
|
||||
--url https://xorg.freedesktop.org/releases/individual/font/ \
|
||||
| sort -V | tail -n1)"
|
||||
update-source-version ${finalAttrs.pname} "$version"
|
||||
'';
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Font encoding tables for libfontenc";
|
||||
homepage = "https://gitlab.freedesktop.org/xorg/font/encodings";
|
||||
license = lib.licenses.publicDomain;
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
@@ -3,6 +3,7 @@
|
||||
lib,
|
||||
bdftopcf,
|
||||
font-alias,
|
||||
font-encodings,
|
||||
font-util,
|
||||
gccmakedep,
|
||||
ico,
|
||||
@@ -85,6 +86,7 @@ self: with self; {
|
||||
xwininfo
|
||||
xwud
|
||||
;
|
||||
encodings = font-encodings;
|
||||
fontalias = font-alias;
|
||||
fontutil = font-util;
|
||||
libAppleWM = libapplewm;
|
||||
@@ -240,41 +242,6 @@ self: with self; {
|
||||
})
|
||||
) { };
|
||||
|
||||
# THIS IS A GENERATED FILE. DO NOT EDIT!
|
||||
encodings = callPackage (
|
||||
{
|
||||
stdenv,
|
||||
pkg-config,
|
||||
fetchurl,
|
||||
mkfontscale,
|
||||
testers,
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "encodings";
|
||||
version = "1.1.0";
|
||||
builder = ./builder.sh;
|
||||
src = fetchurl {
|
||||
url = "mirror://xorg/individual/font/encodings-1.1.0.tar.xz";
|
||||
sha256 = "0xg99nmpvik6vaz4h03xay7rx0r3bf5a8azkjlpa3ksn2xi3rwcz";
|
||||
};
|
||||
hardeningDisable = [
|
||||
"bindnow"
|
||||
"relro"
|
||||
];
|
||||
strictDeps = true;
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
mkfontscale
|
||||
];
|
||||
buildInputs = [ ];
|
||||
passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
|
||||
meta = {
|
||||
pkgConfigModules = [ ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
) { };
|
||||
|
||||
# THIS IS A GENERATED FILE. DO NOT EDIT!
|
||||
fontadobe100dpi = callPackage (
|
||||
{
|
||||
|
||||
@@ -296,6 +296,7 @@ print OUT <<EOF;
|
||||
lib,
|
||||
bdftopcf,
|
||||
font-alias,
|
||||
font-encodings,
|
||||
font-util,
|
||||
gccmakedep,
|
||||
ico,
|
||||
@@ -378,6 +379,7 @@ self: with self; {
|
||||
xwininfo
|
||||
xwud
|
||||
;
|
||||
encodings = font-encodings;
|
||||
fontalias = font-alias;
|
||||
fontutil = font-util;
|
||||
libAppleWM = libapplewm;
|
||||
|
||||
@@ -105,7 +105,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/encodings-1.1.0.tar.xz
|
||||
mirror://xorg/individual/font/font-adobe-75dpi-1.0.4.tar.xz
|
||||
mirror://xorg/individual/font/font-adobe-100dpi-1.0.4.tar.xz
|
||||
mirror://xorg/individual/font/font-adobe-utopia-75dpi-1.0.5.tar.xz
|
||||
|
||||
Reference in New Issue
Block a user