mkfontscale: refactor and move to pkgs/by-name from xorg namespace (#415128)

authored by jopejoe1 and committed by GitHub 25934a42 2ab6b0c4

+57 -42
+53
pkgs/by-name/mk/mkfontscale/package.nix
···
··· 1 + { 2 + lib, 3 + stdenv, 4 + fetchurl, 5 + pkg-config, 6 + libfontenc, 7 + freetype, 8 + xorgproto, 9 + zlib, 10 + writeScript, 11 + }: 12 + stdenv.mkDerivation (finalAttrs: { 13 + pname = "mkfontscale"; 14 + version = "1.2.3"; 15 + 16 + src = fetchurl { 17 + url = "mirror://xorg/individual/app/mkfontscale-${finalAttrs.version}.tar.xz"; 18 + hash = "sha256-KSHNw0TxrO4EvNbqHilWXBMIJjAG4TSp7jjPnJ1v514="; 19 + }; 20 + 21 + strictDeps = true; 22 + nativeBuildInputs = [ pkg-config ]; 23 + buildInputs = [ 24 + libfontenc 25 + freetype 26 + xorgproto 27 + zlib 28 + ]; 29 + 30 + passthru = { 31 + updateScript = writeScript "update-${finalAttrs.pname}" '' 32 + #!/usr/bin/env nix-shell 33 + #!nix-shell -i bash -p common-updater-scripts 34 + version="$(list-directory-versions --pname ${finalAttrs.pname} \ 35 + --url https://xorg.freedesktop.org/releases/individual/app/ \ 36 + | sort -V | tail -n1)" 37 + update-source-version ${finalAttrs.pname} "$version" 38 + ''; 39 + }; 40 + 41 + meta = { 42 + description = "Utilities to create the fonts.scale and fonts.dir index files used by the legacy X11 font system"; 43 + homepage = "https://gitlab.freedesktop.org/xorg/app/mkfontscale"; 44 + license = with lib.licenses; [ 45 + mit 46 + mitOpenGroup 47 + hpndSellVariant 48 + ]; 49 + maintainers = [ ]; 50 + mainProgram = "mkfontscale"; 51 + platforms = lib.platforms.unix; 52 + }; 53 + })
+2 -40
pkgs/servers/x11/xorg/default.nix
··· 22 lndir, 23 luit, 24 makedepend, 25 pixman, 26 sessreg, 27 util-macros, ··· 50 lndir 51 luit 52 makedepend 53 pixman 54 sessreg 55 xbitmaps ··· 2957 libXmu 2958 xorgproto 2959 libXt 2960 - ]; 2961 - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 2962 - meta = { 2963 - pkgConfigModules = [ ]; 2964 - platforms = lib.platforms.unix; 2965 - }; 2966 - }) 2967 - ) { }; 2968 - 2969 - # THIS IS A GENERATED FILE. DO NOT EDIT! 2970 - mkfontscale = callPackage ( 2971 - { 2972 - stdenv, 2973 - pkg-config, 2974 - fetchurl, 2975 - libfontenc, 2976 - freetype, 2977 - xorgproto, 2978 - zlib, 2979 - testers, 2980 - }: 2981 - stdenv.mkDerivation (finalAttrs: { 2982 - pname = "mkfontscale"; 2983 - version = "1.2.3"; 2984 - builder = ./builder.sh; 2985 - src = fetchurl { 2986 - url = "mirror://xorg/individual/app/mkfontscale-1.2.3.tar.xz"; 2987 - sha256 = "0pp7dyfrrkrqxslk9q8660k0h4swaqlixsnnph2fxb7i8k1ws899"; 2988 - }; 2989 - hardeningDisable = [ 2990 - "bindnow" 2991 - "relro" 2992 - ]; 2993 - strictDeps = true; 2994 - nativeBuildInputs = [ pkg-config ]; 2995 - buildInputs = [ 2996 - libfontenc 2997 - freetype 2998 - xorgproto 2999 - zlib 3000 ]; 3001 passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 3002 meta = {
··· 22 lndir, 23 luit, 24 makedepend, 25 + mkfontscale, 26 pixman, 27 sessreg, 28 util-macros, ··· 51 lndir 52 luit 53 makedepend 54 + mkfontscale 55 pixman 56 sessreg 57 xbitmaps ··· 2959 libXmu 2960 xorgproto 2961 libXt 2962 ]; 2963 passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 2964 meta = {
+2
pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
··· 310 lndir, 311 luit, 312 makedepend, 313 pixman, 314 sessreg, 315 util-macros, ··· 338 lndir 339 luit 340 makedepend 341 pixman 342 sessreg 343 xbitmaps
··· 310 lndir, 311 luit, 312 makedepend, 313 + mkfontscale, 314 pixman, 315 sessreg, 316 util-macros, ··· 339 lndir 340 luit 341 makedepend 342 + mkfontscale 343 pixman 344 sessreg 345 xbitmaps
-1
pkgs/servers/x11/xorg/overrides.nix
··· 462 }; 463 }); 464 465 - mkfontscale = addMainProgram super.mkfontscale { }; 466 oclock = addMainProgram super.oclock { }; 467 smproxy = addMainProgram super.smproxy { }; 468 transset = addMainProgram super.transset { };
··· 462 }; 463 }); 464 465 oclock = addMainProgram super.oclock { }; 466 smproxy = addMainProgram super.smproxy { }; 467 transset = addMainProgram super.transset { };
-1
pkgs/servers/x11/xorg/tarballs.list
··· 10 mirror://xorg/individual/app/fonttosfnt-1.2.4.tar.xz 11 mirror://xorg/individual/app/iceauth-1.0.10.tar.xz 12 mirror://xorg/individual/app/listres-1.0.6.tar.xz 13 - mirror://xorg/individual/app/mkfontscale-1.2.3.tar.xz 14 mirror://xorg/individual/app/oclock-1.0.6.tar.xz 15 mirror://xorg/individual/app/setxkbmap-1.3.4.tar.xz 16 mirror://xorg/individual/app/smproxy-1.0.8.tar.xz
··· 10 mirror://xorg/individual/app/fonttosfnt-1.2.4.tar.xz 11 mirror://xorg/individual/app/iceauth-1.0.10.tar.xz 12 mirror://xorg/individual/app/listres-1.0.6.tar.xz 13 mirror://xorg/individual/app/oclock-1.0.6.tar.xz 14 mirror://xorg/individual/app/setxkbmap-1.3.4.tar.xz 15 mirror://xorg/individual/app/smproxy-1.0.8.tar.xz