From 0922a4b685bc61cd7ad8e31e7d6dd2c79a06418a Mon Sep 17 00:00:00 2001 From: quantenzitrone Date: Sat, 13 Sep 2025 20:57:51 +0200 Subject: [PATCH 1/5] font-bh-100dpi: refactor, migrate to pkgs/by-name & rename from xorg.fontbh100dpi the package output doesn't change --- pkgs/by-name/fo/font-bh-100dpi/package.nix | 51 +++++++++++++++++++ pkgs/servers/x11/xorg/default.nix | 43 +--------------- .../x11/xorg/generate-expr-from-tarballs.pl | 2 + pkgs/servers/x11/xorg/overrides.nix | 1 - pkgs/servers/x11/xorg/tarballs.list | 1 - 5 files changed, 55 insertions(+), 43 deletions(-) create mode 100644 pkgs/by-name/fo/font-bh-100dpi/package.nix diff --git a/pkgs/by-name/fo/font-bh-100dpi/package.nix b/pkgs/by-name/fo/font-bh-100dpi/package.nix new file mode 100644 index 000000000000..d7e65f131f08 --- /dev/null +++ b/pkgs/by-name/fo/font-bh-100dpi/package.nix @@ -0,0 +1,51 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + font-util, + bdftopcf, + mkfontscale, + writeScript, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "font-bh-100dpi"; + version = "1.0.4"; + + src = fetchurl { + url = "mirror://xorg/individual/font/font-bh-100dpi-${finalAttrs.version}.tar.xz"; + hash = "sha256-/Y9e/oSR+qvdJ0SAjT1Or9rlyD5hcBfH/d0nFtBJqx4="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + pkg-config + bdftopcf + font-util + mkfontscale + ]; + + buildInputs = [ font-util ]; + + 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 = "Luxi 100dpi pcf fonts"; + homepage = "https://gitlab.freedesktop.org/xorg/font/bh-100dpi"; + license = lib.licenses.unfreeRedistributable; + maintainers = [ ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 15acd52e9e48..8e2759acc1cb 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -3,6 +3,7 @@ lib, bdftopcf, font-alias, + font-bh-100dpi, font-bh-ttf, font-bh-type1, font-encodings, @@ -118,6 +119,7 @@ self: with self; { ; encodings = font-encodings; fontalias = font-alias; + fontbh100dpi = font-bh-100dpi; fontbhttf = font-bh-ttf; fontbhtype1 = font-bh-type1; fontmuttmisc = font-mutt-misc; @@ -534,47 +536,6 @@ self: with self; { }) ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! - fontbh100dpi = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - fontutil, - bdftopcf, - mkfontscale, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "font-bh-100dpi"; - version = "1.0.4"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/font/font-bh-100dpi-1.0.4.tar.xz"; - sha256 = "07mb9781c9yxzp3ifw317v4fbnmg9qyqv0244zfspylihkz5x3zx"; - }; - 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! fontbh75dpi = callPackage ( { diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 0abd26780af1..08c557c60974 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -319,6 +319,7 @@ print OUT < Date: Sat, 13 Sep 2025 21:01:59 +0200 Subject: [PATCH 2/5] font-bh-75dpi: refactor, move to pkgs/by-name & rename from xorg.fontbh75dpi the package output doesn't change --- pkgs/by-name/fo/font-bh-75dpi/package.nix | 51 +++++++++++++++++++ pkgs/servers/x11/xorg/default.nix | 43 +--------------- .../x11/xorg/generate-expr-from-tarballs.pl | 2 + pkgs/servers/x11/xorg/overrides.nix | 1 - pkgs/servers/x11/xorg/tarballs.list | 1 - 5 files changed, 55 insertions(+), 43 deletions(-) create mode 100644 pkgs/by-name/fo/font-bh-75dpi/package.nix diff --git a/pkgs/by-name/fo/font-bh-75dpi/package.nix b/pkgs/by-name/fo/font-bh-75dpi/package.nix new file mode 100644 index 000000000000..f639da44cfbe --- /dev/null +++ b/pkgs/by-name/fo/font-bh-75dpi/package.nix @@ -0,0 +1,51 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + font-util, + bdftopcf, + mkfontscale, + writeScript, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "font-bh-75dpi"; + version = "1.0.4"; + + src = fetchurl { + url = "mirror://xorg/individual/font/font-bh-75dpi-${finalAttrs.version}.tar.xz"; + hash = "sha256-YCbYwHNWPdPLtIeNAHbu2XDeur0hQjs7Yd2QRBuefNo="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + pkg-config + bdftopcf + font-util + mkfontscale + ]; + + buildInputs = [ font-util ]; + + 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 = "Luxi 75dpi pcf fonts"; + homepage = "https://gitlab.freedesktop.org/xorg/font/bh-75dpi"; + license = lib.licenses.unfreeRedistributable; + maintainers = [ ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 8e2759acc1cb..568ff545aafd 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -4,6 +4,7 @@ bdftopcf, font-alias, font-bh-100dpi, + font-bh-75dpi, font-bh-ttf, font-bh-type1, font-encodings, @@ -120,6 +121,7 @@ self: with self; { encodings = font-encodings; fontalias = font-alias; fontbh100dpi = font-bh-100dpi; + fontbh75dpi = font-bh-75dpi; fontbhttf = font-bh-ttf; fontbhtype1 = font-bh-type1; fontmuttmisc = font-mutt-misc; @@ -536,47 +538,6 @@ self: with self; { }) ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! - fontbh75dpi = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - fontutil, - bdftopcf, - mkfontscale, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "font-bh-75dpi"; - version = "1.0.4"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/font/font-bh-75dpi-1.0.4.tar.xz"; - sha256 = "1nkwkqdl946xc4xknhi1pnxdww6rxrv013c7nk5x6ganfg0dh9k0"; - }; - 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! fontbhlucidatypewriter100dpi = callPackage ( { diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 08c557c60974..f025450bddc9 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -320,6 +320,7 @@ print OUT < Date: Sat, 13 Sep 2025 21:43:46 +0200 Subject: [PATCH 3/5] font-bh-lucidatypewriter-100dpi: refactor, move to pkgs/by-name & rename from xorg.fontbhlucidatypewriter100dpi this doesn't change the package output' --- .../package.nix | 52 +++++++++++++++++++ pkgs/servers/x11/xorg/default.nix | 43 +-------------- .../x11/xorg/generate-expr-from-tarballs.pl | 2 + pkgs/servers/x11/xorg/overrides.nix | 1 - pkgs/servers/x11/xorg/tarballs.list | 1 - 5 files changed, 56 insertions(+), 43 deletions(-) create mode 100644 pkgs/by-name/fo/font-bh-lucidatypewriter-100dpi/package.nix diff --git a/pkgs/by-name/fo/font-bh-lucidatypewriter-100dpi/package.nix b/pkgs/by-name/fo/font-bh-lucidatypewriter-100dpi/package.nix new file mode 100644 index 000000000000..d25eabfe905a --- /dev/null +++ b/pkgs/by-name/fo/font-bh-lucidatypewriter-100dpi/package.nix @@ -0,0 +1,52 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + font-util, + bdftopcf, + mkfontscale, + writeScript, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "font-bh-lucidatypewriter-100dpi"; + version = "1.0.4"; + + src = fetchurl { + url = "mirror://xorg/individual/font/font-bh-lucidatypewriter-100dpi-${finalAttrs.version}.tar.xz"; + hash = "sha256-duwJ7aQJSinUe5HPWcProinI99HKa64qu7P5JeM96PI="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + pkg-config + bdftopcf + font-util + mkfontscale + ]; + + buildInputs = [ font-util ]; + + 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 = "Lucida Sans Typewriter 100dpi pcf fonts"; + homepage = "https://gitlab.freedesktop.org/xorg/font/bh-lucidatypewriter-100dpi"; + # no license just a copyright notice + license = lib.licenses.unfree; + maintainers = [ ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 568ff545aafd..685603d467a3 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -5,6 +5,7 @@ font-alias, font-bh-100dpi, font-bh-75dpi, + font-bh-lucidatypewriter-100dpi, font-bh-ttf, font-bh-type1, font-encodings, @@ -122,6 +123,7 @@ self: with self; { fontalias = font-alias; fontbh100dpi = font-bh-100dpi; fontbh75dpi = font-bh-75dpi; + fontbhlucidatypewriter100dpi = font-bh-lucidatypewriter-100dpi; fontbhttf = font-bh-ttf; fontbhtype1 = font-bh-type1; fontmuttmisc = font-mutt-misc; @@ -538,47 +540,6 @@ self: with self; { }) ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! - fontbhlucidatypewriter100dpi = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - fontutil, - bdftopcf, - mkfontscale, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "font-bh-lucidatypewriter-100dpi"; - version = "1.0.4"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/font/font-bh-lucidatypewriter-100dpi-1.0.4.tar.xz"; - sha256 = "1wp87pijbydkpcmawsyas7vwhad2xg1mkkwigga2jjh9lknhkv3n"; - }; - 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! fontbhlucidatypewriter75dpi = callPackage ( { diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index f025450bddc9..40b2c2ec1e4e 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -321,6 +321,7 @@ print OUT < Date: Tue, 26 Aug 2025 16:17:39 +0200 Subject: [PATCH 4/5] font-bh-lucidatypewriter-75dpi: refactor, move to pkgs/by-name and rename from xorg.fontbhlucidatypewriter75dpi relevant changes: - license is now unfree instead of unfreeRedistributable because the COPYING file in the repo only has a copyright notice The link in overrides goes to the license of the Bigelow & Holmes Luxi fonts which are the font-bh-<...> packages this doesn't change the package output --- .../package.nix | 52 +++++++++++++++++++ pkgs/servers/x11/xorg/default.nix | 43 +-------------- .../x11/xorg/generate-expr-from-tarballs.pl | 2 + pkgs/servers/x11/xorg/overrides.nix | 4 -- pkgs/servers/x11/xorg/tarballs.list | 1 - 5 files changed, 56 insertions(+), 46 deletions(-) create mode 100644 pkgs/by-name/fo/font-bh-lucidatypewriter-75dpi/package.nix diff --git a/pkgs/by-name/fo/font-bh-lucidatypewriter-75dpi/package.nix b/pkgs/by-name/fo/font-bh-lucidatypewriter-75dpi/package.nix new file mode 100644 index 000000000000..455fe1a6f326 --- /dev/null +++ b/pkgs/by-name/fo/font-bh-lucidatypewriter-75dpi/package.nix @@ -0,0 +1,52 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + font-util, + bdftopcf, + mkfontscale, + writeScript, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "font-bh-lucidatypewriter-75dpi"; + version = "1.0.4"; + + src = fetchurl { + url = "mirror://xorg/individual/font/font-bh-lucidatypewriter-75dpi-${finalAttrs.version}.tar.xz"; + hash = "sha256-hk4sOaxh8E9pP8LIqq7SSymMLNQCg87BLu5FnFY16PU="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + pkg-config + bdftopcf + font-util + mkfontscale + ]; + + buildInputs = [ font-util ]; + + 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 = "Lucida Sans Typewriter 75dpi pcf fonts"; + homepage = "https://gitlab.freedesktop.org/xorg/font/bh-lucidatypewriter-75dpi"; + # no license just a copyright notice + license = lib.licenses.unfree; + maintainers = [ ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 685603d467a3..d0c01ca208ea 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -6,6 +6,7 @@ font-bh-100dpi, font-bh-75dpi, font-bh-lucidatypewriter-100dpi, + font-bh-lucidatypewriter-75dpi, font-bh-ttf, font-bh-type1, font-encodings, @@ -124,6 +125,7 @@ self: with self; { fontbh100dpi = font-bh-100dpi; fontbh75dpi = font-bh-75dpi; fontbhlucidatypewriter100dpi = font-bh-lucidatypewriter-100dpi; + fontbhlucidatypewriter75dpi = font-bh-lucidatypewriter-75dpi; fontbhttf = font-bh-ttf; fontbhtype1 = font-bh-type1; fontmuttmisc = font-mutt-misc; @@ -540,47 +542,6 @@ self: with self; { }) ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! - fontbhlucidatypewriter75dpi = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - fontutil, - bdftopcf, - mkfontscale, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "font-bh-lucidatypewriter-75dpi"; - version = "1.0.4"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/font/font-bh-lucidatypewriter-75dpi-1.0.4.tar.xz"; - sha256 = "1xg86mb9qigf5v0wx0q2shn8qaabsapamj627xllzw31mhwjqkl6"; - }; - 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! fontbitstream100dpi = callPackage ( { diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 40b2c2ec1e4e..fb4aee3cddfa 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -322,6 +322,7 @@ print OUT < Date: Sat, 13 Sep 2025 22:24:06 +0200 Subject: [PATCH 5/5] font-bh{,-lucidatypewriter}-{100,75}dpi: move font from $out/lib to $out/share also fixes the paths in xdummy to point to the new font locations --- pkgs/by-name/fo/font-bh-100dpi/package.nix | 2 +- pkgs/by-name/fo/font-bh-75dpi/package.nix | 2 +- pkgs/by-name/fo/font-bh-lucidatypewriter-100dpi/package.nix | 2 +- pkgs/by-name/fo/font-bh-lucidatypewriter-75dpi/package.nix | 2 +- pkgs/by-name/xd/xdummy/package.nix | 6 +++--- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/fo/font-bh-100dpi/package.nix b/pkgs/by-name/fo/font-bh-100dpi/package.nix index d7e65f131f08..7932de16aa13 100644 --- a/pkgs/by-name/fo/font-bh-100dpi/package.nix +++ b/pkgs/by-name/fo/font-bh-100dpi/package.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ font-util ]; - configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + configureFlags = [ "--with-fontrootdir=$(out)/share/fonts/X11" ]; passthru = { updateScript = writeScript "update-${finalAttrs.pname}" '' diff --git a/pkgs/by-name/fo/font-bh-75dpi/package.nix b/pkgs/by-name/fo/font-bh-75dpi/package.nix index f639da44cfbe..c970a3826f54 100644 --- a/pkgs/by-name/fo/font-bh-75dpi/package.nix +++ b/pkgs/by-name/fo/font-bh-75dpi/package.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ font-util ]; - configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + configureFlags = [ "--with-fontrootdir=$(out)/share/fonts/X11" ]; passthru = { updateScript = writeScript "update-${finalAttrs.pname}" '' diff --git a/pkgs/by-name/fo/font-bh-lucidatypewriter-100dpi/package.nix b/pkgs/by-name/fo/font-bh-lucidatypewriter-100dpi/package.nix index d25eabfe905a..7f80b188a61d 100644 --- a/pkgs/by-name/fo/font-bh-lucidatypewriter-100dpi/package.nix +++ b/pkgs/by-name/fo/font-bh-lucidatypewriter-100dpi/package.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ font-util ]; - configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + configureFlags = [ "--with-fontrootdir=$(out)/share/fonts/X11" ]; passthru = { updateScript = writeScript "update-${finalAttrs.pname}" '' diff --git a/pkgs/by-name/fo/font-bh-lucidatypewriter-75dpi/package.nix b/pkgs/by-name/fo/font-bh-lucidatypewriter-75dpi/package.nix index 455fe1a6f326..696a05e0e0e1 100644 --- a/pkgs/by-name/fo/font-bh-lucidatypewriter-75dpi/package.nix +++ b/pkgs/by-name/fo/font-bh-lucidatypewriter-75dpi/package.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ font-util ]; - configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + configureFlags = [ "--with-fontrootdir=$(out)/share/fonts/X11" ]; passthru = { updateScript = writeScript "update-${finalAttrs.pname}" '' diff --git a/pkgs/by-name/xd/xdummy/package.nix b/pkgs/by-name/xd/xdummy/package.nix index 399226c7fc85..eca25be27d56 100644 --- a/pkgs/by-name/xd/xdummy/package.nix +++ b/pkgs/by-name/xd/xdummy/package.nix @@ -34,9 +34,9 @@ let FontPath "${xorg.fontmiscmisc}/lib/X11/fonts/misc" FontPath "${xorg.fontcursormisc}/lib/X11/fonts/misc" ${lib.optionalString unfreeFonts '' - FontPath "${xorg.fontbhlucidatypewriter75dpi}/lib/X11/fonts/75dpi" - FontPath "${xorg.fontbhlucidatypewriter100dpi}/lib/X11/fonts/100dpi" - FontPath "${xorg.fontbh100dpi}/lib/X11/fonts/100dpi" + FontPath "${xorg.fontbhlucidatypewriter75dpi}/share/fonts/X11/75dpi" + FontPath "${xorg.fontbhlucidatypewriter100dpi}/share/fonts/X11/100dpi" + FontPath "${xorg.fontbh100dpi}/share/fonts/X11/100dpi" ''} EndSection