diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index fdc2164f0f9d..517305daab25 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -1021,7 +1021,8 @@ in fonts.packages = [ (if cfg.upscaleDefaultCursor then fontcursormisc_hidpi else pkgs.xorg.fontcursormisc) - pkgs.xorg.fontmiscmisc + pkgs.font-misc-misc + pkgs.font-alias ]; }; diff --git a/pkgs/by-name/fo/font-arabic-misc/package.nix b/pkgs/by-name/fo/font-arabic-misc/package.nix new file mode 100644 index 000000000000..b0a11f198e83 --- /dev/null +++ b/pkgs/by-name/fo/font-arabic-misc/package.nix @@ -0,0 +1,43 @@ +{ + lib, + stdenv, + fetchurl, + 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 = [ + bdftopcf + 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 ${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; + }; +}) diff --git a/pkgs/by-name/fo/font-cursor-misc/package.nix b/pkgs/by-name/fo/font-cursor-misc/package.nix new file mode 100644 index 000000000000..a25a3e2277ac --- /dev/null +++ b/pkgs/by-name/fo/font-cursor-misc/package.nix @@ -0,0 +1,44 @@ +{ + lib, + stdenv, + fetchurl, + bdftopcf, + mkfontscale, + writeScript, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "font-cursor-misc"; + version = "1.0.4"; + + src = fetchurl { + url = "mirror://xorg/individual/font/font-cursor-misc-${finalAttrs.version}.tar.xz"; + hash = "sha256-JdnJWVATy4yghCBQmZOmQ0yRflPKH+w/Y6zUWhnU+YI="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + bdftopcf + 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 ${finalAttrs.pname} \ + --url https://xorg.freedesktop.org/releases/individual/font/ \ + | sort -V | tail -n1)" + update-source-version ${finalAttrs.pname} "$version" + ''; + }; + + meta = { + description = "X Cursor as a pcf font"; + homepage = "https://gitlab.freedesktop.org/xorg/font/cursor-misc"; + # "These ""glyphs"" are unencumbered" + license = lib.licenses.publicDomain; + maintainers = [ ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/fo/font-daewoo-misc/package.nix b/pkgs/by-name/fo/font-daewoo-misc/package.nix new file mode 100644 index 000000000000..060e5161c6e2 --- /dev/null +++ b/pkgs/by-name/fo/font-daewoo-misc/package.nix @@ -0,0 +1,44 @@ +{ + lib, + stdenv, + fetchurl, + bdftopcf, + mkfontscale, + writeScript, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "font-daewoo-misc"; + version = "1.0.4"; + + src = fetchurl { + url = "mirror://xorg/individual/font/font-daewoo-misc-${finalAttrs.version}.tar.xz"; + hash = "sha256-9jyLPcjzAJjLhot9ssLAyLWz/Szv0EQDVpekPUx6TzE="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + bdftopcf + 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 ${finalAttrs.pname} \ + --url https://xorg.freedesktop.org/releases/individual/font/ \ + | sort -V | tail -n1)" + update-source-version ${finalAttrs.pname} "$version" + ''; + }; + + meta = { + description = "Daewoo Gothic and Daewoo Mincho pcf fonts"; + homepage = "https://gitlab.freedesktop.org/xorg/font/daewoo-misc"; + # no license, just a copyright notice + license = lib.licenses.unfree; + maintainers = [ ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/fo/font-dec-misc/package.nix b/pkgs/by-name/fo/font-dec-misc/package.nix new file mode 100644 index 000000000000..d6d21b13bc74 --- /dev/null +++ b/pkgs/by-name/fo/font-dec-misc/package.nix @@ -0,0 +1,43 @@ +{ + lib, + stdenv, + fetchurl, + 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 = [ + bdftopcf + 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 ${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; + }; +}) diff --git a/pkgs/by-name/fo/font-ibm-type1/package.nix b/pkgs/by-name/fo/font-ibm-type1/package.nix new file mode 100644 index 000000000000..4762f615625f --- /dev/null +++ b/pkgs/by-name/fo/font-ibm-type1/package.nix @@ -0,0 +1,39 @@ +{ + lib, + stdenv, + fetchurl, + mkfontscale, + writeScript, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "font-ibm-type1"; + version = "1.0.4"; + + src = fetchurl { + url = "mirror://xorg/individual/font/font-ibm-type1-${finalAttrs.version}.tar.xz"; + hash = "sha256-xDlelbpG1AxK0XN+kcrCDAq3VBEym2DbXZn+2Stgzn8="; + }; + + 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 ${finalAttrs.pname} \ + --url https://xorg.freedesktop.org/releases/individual/font/ \ + | sort -V | tail -n1)" + update-source-version ${finalAttrs.pname} "$version" + ''; + }; + + meta = { + description = "IBM Courier Type1 fonts"; + homepage = "https://gitlab.freedesktop.org/xorg/font/ibm-type1"; + license = lib.licenses.unfreeRedistributable; + maintainers = [ ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/fo/font-jis-misc/package.nix b/pkgs/by-name/fo/font-jis-misc/package.nix new file mode 100644 index 000000000000..a4f3daa955e5 --- /dev/null +++ b/pkgs/by-name/fo/font-jis-misc/package.nix @@ -0,0 +1,46 @@ +{ + lib, + stdenv, + fetchurl, + bdftopcf, + mkfontscale, + writeScript, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "font-jis-misc"; + version = "1.0.4"; + + src = fetchurl { + url = "mirror://xorg/individual/font/font-jis-misc-${finalAttrs.version}.tar.xz"; + hash = "sha256-eNHv9sRx96poAqJtYszPUdjlGFWGQG2bbh7mkbC/+tA="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + bdftopcf + 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 ${finalAttrs.pname} \ + --url https://xorg.freedesktop.org/releases/individual/font/ \ + | sort -V | tail -n1)" + update-source-version ${finalAttrs.pname} "$version" + ''; + }; + + meta = { + description = "JIS X 9051: 1984 pcf font"; + homepage = "https://gitlab.freedesktop.org/xorg/font/jis-misc"; + # licensing is unclear: + # - COPYING just says "permission to use" + # - The industial standard (JIS X 9051: 1984) this is from, is paid. + license = lib.licenses.unfree; + maintainers = [ ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/fo/font-misc-meltho/package.nix b/pkgs/by-name/fo/font-misc-meltho/package.nix new file mode 100644 index 000000000000..596984a8b072 --- /dev/null +++ b/pkgs/by-name/fo/font-misc-meltho/package.nix @@ -0,0 +1,40 @@ +{ + lib, + stdenv, + fetchurl, + mkfontscale, + writeScript, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "font-misc-meltho"; + version = "1.0.4"; + + src = fetchurl { + url = "mirror://xorg/individual/font/font-misc-meltho-${finalAttrs.version}.tar.xz"; + hash = "sha256-Y75ewXB4iY8mPCQJami0OuWwa4iFLkJUmvoD0STWUhk="; + }; + + 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 ${finalAttrs.pname} \ + --url https://xorg.freedesktop.org/releases/individual/font/ \ + | sort -V | tail -n1)" + update-source-version ${finalAttrs.pname} "$version" + ''; + }; + + meta = { + description = "Collection of otf fonts designed for the display of syriac text"; + homepage = "https://gitlab.freedesktop.org/xorg/font/misc-meltho"; + # modified Bigelow & Holmes Font License + license = lib.licenses.unfreeRedistributable; + maintainers = [ ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/fo/font-misc-misc/package.nix b/pkgs/by-name/fo/font-misc-misc/package.nix new file mode 100644 index 000000000000..84cd9d1a1abc --- /dev/null +++ b/pkgs/by-name/fo/font-misc-misc/package.nix @@ -0,0 +1,51 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + font-util, + bdftopcf, + mkfontscale, + writeScript, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "font-misc-misc"; + version = "1.1.3"; + + src = fetchurl { + url = "mirror://xorg/individual/font/font-misc-misc-${finalAttrs.version}.tar.xz"; + hash = "sha256-eavjYfWLshren1ZYmOSGMAzhzGIdUoW+wm4Utqhhj+0="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + pkg-config + bdftopcf + font-util + mkfontscale + ]; + + buildInputs = [ font-util ]; + + configureFlags = [ "--with-fontrootdir=$(out)/share/fonts/X11" ]; + + 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 = "Misc pcf fonts in different sizes"; + homepage = "https://gitlab.freedesktop.org/xorg/font/misc-misc"; + license = lib.licenses.publicDomain; + maintainers = [ ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/xd/xdummy/package.nix b/pkgs/by-name/xd/xdummy/package.nix index 92d9355fb31f..d9c27616e29b 100644 --- a/pkgs/by-name/xd/xdummy/package.nix +++ b/pkgs/by-name/xd/xdummy/package.nix @@ -31,8 +31,8 @@ let XkbDir "${xkeyboard_config}/share/X11/xkb" FontPath "${xorg.fontadobe75dpi}/share/fonts/X11/75dpi" FontPath "${xorg.fontadobe100dpi}/share/fonts/X11/100dpi" - FontPath "${xorg.fontmiscmisc}/lib/X11/fonts/misc" - FontPath "${xorg.fontcursormisc}/lib/X11/fonts/misc" + FontPath "${xorg.fontmiscmisc}/share/fonts/X11/misc" + FontPath "${xorg.fontcursormisc}/share/fonts/X11/misc" ${lib.optionalString unfreeFonts '' FontPath "${xorg.fontbhlucidatypewriter75dpi}/share/fonts/X11/75dpi" FontPath "${xorg.fontbhlucidatypewriter100dpi}/share/fonts/X11/100dpi" diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 61db87acd555..46a49e3f7d54 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -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, @@ -19,11 +20,18 @@ font-bitstream-75dpi, font-bitstream-type1, font-cronyx-cyrillic, + font-cursor-misc, + font-daewoo-misc, + font-dec-misc, font-encodings, + font-ibm-type1, font-isas-misc, + font-jis-misc, font-micro-misc, font-misc-cyrillic, font-misc-ethiopic, + font-misc-meltho, + font-misc-misc, font-mutt-misc, font-schumacher-misc, font-screen-cyrillic, @@ -213,6 +221,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; @@ -223,10 +232,17 @@ self: with self; { fontbitstream75dpi = font-bitstream-75dpi; fontbitstreamtype1 = font-bitstream-type1; fontcronyxcyrillic = font-cronyx-cyrillic; + fontcursormisc = font-cursor-misc; + fontdaewoomisc = font-daewoo-misc; + fontdecmisc = font-dec-misc; + fontibmtype1 = font-ibm-type1; fontisasmisc = font-isas-misc; + fontjismisc = font-jis-misc; fontmicromisc = font-micro-misc; fontmisccyrillic = font-misc-cyrillic; fontmiscethiopic = font-misc-ethiopic; + fontmiscmeltho = font-misc-meltho; + fontmiscmisc = font-misc-misc; fontmuttmisc = font-mutt-misc; fontschumachermisc = font-schumacher-misc; fontscreencyrillic = font-screen-cyrillic; @@ -382,323 +398,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 ( - { - stdenv, - pkg-config, - fetchurl, - fontutil, - bdftopcf, - mkfontscale, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "font-cursor-misc"; - version = "1.0.4"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/font/font-cursor-misc-1.0.4.tar.xz"; - sha256 = "10prshcmmm5ccczyq7yaadz92k23ls9rjl10hjh8rjqka1cwkn95"; - }; - 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! - fontdaewoomisc = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - fontutil, - bdftopcf, - mkfontscale, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "font-daewoo-misc"; - version = "1.0.4"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/font/font-daewoo-misc-1.0.4.tar.xz"; - sha256 = "0cagg963v94paq1l9l7g5kyv7df8q31b4zcbhv5rh07kr0yqng7n"; - }; - 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! - 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 ( - { - stdenv, - pkg-config, - fetchurl, - fontutil, - mkfontscale, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "font-ibm-type1"; - version = "1.0.4"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/font/font-ibm-type1-1.0.4.tar.xz"; - sha256 = "0zyfc0mxkzlrbpdn16rj25abf2hcqb592zkks550rm26paamwff4"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ - pkg-config - 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! - fontjismisc = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - fontutil, - bdftopcf, - mkfontscale, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "font-jis-misc"; - version = "1.0.4"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/font/font-jis-misc-1.0.4.tar.xz"; - sha256 = "1l7spyq93rhydsdnsh46alcfbn2irz664vd209lamxviqkvfzlbq"; - }; - 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! - fontmiscmeltho = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - fontutil, - mkfontscale, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "font-misc-meltho"; - version = "1.0.4"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/font/font-misc-meltho-1.0.4.tar.xz"; - sha256 = "06ajsqjd20zsk9a44bl5i1mv1r9snil6l2947hk8z2bqf30mxgk3"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ - pkg-config - 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! - fontmiscmisc = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - fontutil, - bdftopcf, - mkfontscale, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "font-misc-misc"; - version = "1.1.3"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/font/font-misc-misc-1.1.3.tar.xz"; - sha256 = "1vcgc6lbc53fqaz8alhxcb6f231hhvj9hn2nkzg1mclbymhy7avr"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ - pkg-config - bdftopcf - fontutil - 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! fonttosfnt = callPackage ( { diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index d87b1ad6879d..5e7eb1243b5b 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -340,6 +340,7 @@ print OUT <