font-dec-misc: refactor, move to pkgs/by-name and rename from xorg.fontdecmisc
the output doesn't change
This commit is contained in:
@@ -0,0 +1,50 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
pkg-config,
|
||||
fontutil,
|
||||
bdftopcf,
|
||||
mkfontscale,
|
||||
writeScript,
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "font-dec-misc";
|
||||
version = "1.0.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://xorg/individual/font/font-dec-misc-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-gtloIB2P+L7A5R3M14G7TU6/F+EQBJRCeb3AIB4WGvc=";
|
||||
};
|
||||
|
||||
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 = "DEC cursors in pcf font format";
|
||||
homepage = "https://gitlab.freedesktop.org/xorg/font/dec-misc";
|
||||
license = lib.licenses.hpnd;
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
@@ -22,6 +22,7 @@
|
||||
font-cronyx-cyrillic,
|
||||
font-cursor-misc,
|
||||
font-daewoo-misc,
|
||||
font-dec-misc,
|
||||
font-encodings,
|
||||
font-isas-misc,
|
||||
font-micro-misc,
|
||||
@@ -229,6 +230,7 @@ self: with self; {
|
||||
fontcronyxcyrillic = font-cronyx-cyrillic;
|
||||
fontcursormisc = font-cursor-misc;
|
||||
fontdaewoomisc = font-daewoo-misc;
|
||||
fontdecmisc = font-dec-misc;
|
||||
fontisasmisc = font-isas-misc;
|
||||
fontmicromisc = font-micro-misc;
|
||||
fontmisccyrillic = font-misc-cyrillic;
|
||||
@@ -388,46 +390,6 @@ self: with self; {
|
||||
})
|
||||
) { };
|
||||
|
||||
# THIS IS A GENERATED FILE. DO NOT EDIT!
|
||||
fontdecmisc = callPackage (
|
||||
{
|
||||
stdenv,
|
||||
pkg-config,
|
||||
fetchurl,
|
||||
fontutil,
|
||||
bdftopcf,
|
||||
mkfontscale,
|
||||
testers,
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "font-dec-misc";
|
||||
version = "1.0.4";
|
||||
builder = ./builder.sh;
|
||||
src = fetchurl {
|
||||
url = "mirror://xorg/individual/font/font-dec-misc-1.0.4.tar.xz";
|
||||
sha256 = "1xqs2qg21h5xg519810hw4bvykjdpf0xgk0xwp0bxy4g3lh6inc2";
|
||||
};
|
||||
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!
|
||||
fontibmtype1 = callPackage (
|
||||
{
|
||||
|
||||
@@ -353,6 +353,7 @@ print OUT <<EOF;
|
||||
font-cronyx-cyrillic,
|
||||
font-cursor-misc,
|
||||
font-daewoo-misc,
|
||||
font-dec-misc,
|
||||
font-encodings,
|
||||
font-isas-misc,
|
||||
font-micro-misc,
|
||||
@@ -560,6 +561,7 @@ self: with self; {
|
||||
fontcronyxcyrillic = font-cronyx-cyrillic;
|
||||
fontcursormisc = font-cursor-misc;
|
||||
fontdaewoomisc = font-daewoo-misc;
|
||||
fontdecmisc = font-dec-misc;
|
||||
fontisasmisc = font-isas-misc;
|
||||
fontmicromisc = font-micro-misc;
|
||||
fontmisccyrillic = font-misc-cyrillic;
|
||||
|
||||
@@ -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-dec-misc-1.0.4.tar.xz
|
||||
mirror://xorg/individual/font/font-ibm-type1-1.0.4.tar.xz
|
||||
mirror://xorg/individual/font/font-jis-misc-1.0.4.tar.xz
|
||||
mirror://xorg/individual/font/font-misc-meltho-1.0.4.tar.xz
|
||||
|
||||
Reference in New Issue
Block a user