diff --git a/pkgs/by-name/fo/font-arabic-misc/package.nix b/pkgs/by-name/fo/font-arabic-misc/package.nix index b12716943a87..b0a11f198e83 100644 --- a/pkgs/by-name/fo/font-arabic-misc/package.nix +++ b/pkgs/by-name/fo/font-arabic-misc/package.nix @@ -2,8 +2,6 @@ lib, stdenv, fetchurl, - pkg-config, - fontutil, bdftopcf, mkfontscale, writeScript, @@ -20,15 +18,10 @@ stdenv.mkDerivation (finalAttrs: { 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 diff --git a/pkgs/by-name/fo/font-cursor-misc/package.nix b/pkgs/by-name/fo/font-cursor-misc/package.nix index 13cf085478a0..a25a3e2277ac 100644 --- a/pkgs/by-name/fo/font-cursor-misc/package.nix +++ b/pkgs/by-name/fo/font-cursor-misc/package.nix @@ -2,8 +2,6 @@ lib, stdenv, fetchurl, - pkg-config, - fontutil, bdftopcf, mkfontscale, writeScript, @@ -24,10 +22,6 @@ stdenv.mkDerivation (finalAttrs: { mkfontscale ]; - buildInputs = [ fontutil ]; - - configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; - passthru = { updateScript = writeScript "update-${finalAttrs.pname}" '' #!/usr/bin/env nix-shell diff --git a/pkgs/by-name/fo/font-daewoo-misc/package.nix b/pkgs/by-name/fo/font-daewoo-misc/package.nix index de553d2a1375..060e5161c6e2 100644 --- a/pkgs/by-name/fo/font-daewoo-misc/package.nix +++ b/pkgs/by-name/fo/font-daewoo-misc/package.nix @@ -2,8 +2,6 @@ lib, stdenv, fetchurl, - pkg-config, - fontutil, bdftopcf, mkfontscale, writeScript, @@ -20,15 +18,10 @@ stdenv.mkDerivation (finalAttrs: { 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 diff --git a/pkgs/by-name/fo/font-dec-misc/package.nix b/pkgs/by-name/fo/font-dec-misc/package.nix index d01519a7dc9e..d6d21b13bc74 100644 --- a/pkgs/by-name/fo/font-dec-misc/package.nix +++ b/pkgs/by-name/fo/font-dec-misc/package.nix @@ -2,8 +2,6 @@ lib, stdenv, fetchurl, - pkg-config, - fontutil, bdftopcf, mkfontscale, writeScript, @@ -20,15 +18,10 @@ stdenv.mkDerivation (finalAttrs: { 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 diff --git a/pkgs/by-name/fo/font-ibm-type1/package.nix b/pkgs/by-name/fo/font-ibm-type1/package.nix index 88168367e60b..4762f615625f 100644 --- a/pkgs/by-name/fo/font-ibm-type1/package.nix +++ b/pkgs/by-name/fo/font-ibm-type1/package.nix @@ -2,8 +2,6 @@ lib, stdenv, fetchurl, - pkg-config, - fontutil, mkfontscale, writeScript, }: @@ -18,14 +16,7 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; - nativeBuildInputs = [ - pkg-config - mkfontscale - ]; - - buildInputs = [ fontutil ]; - - configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + nativeBuildInputs = [ mkfontscale ]; passthru = { updateScript = writeScript "update-${finalAttrs.pname}" '' diff --git a/pkgs/by-name/fo/font-jis-misc/package.nix b/pkgs/by-name/fo/font-jis-misc/package.nix index bf1705c536c7..a4f3daa955e5 100644 --- a/pkgs/by-name/fo/font-jis-misc/package.nix +++ b/pkgs/by-name/fo/font-jis-misc/package.nix @@ -2,8 +2,6 @@ lib, stdenv, fetchurl, - pkg-config, - fontutil, bdftopcf, mkfontscale, writeScript, @@ -20,15 +18,10 @@ stdenv.mkDerivation (finalAttrs: { 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 diff --git a/pkgs/by-name/fo/font-misc-meltho/package.nix b/pkgs/by-name/fo/font-misc-meltho/package.nix index 184dc791b055..596984a8b072 100644 --- a/pkgs/by-name/fo/font-misc-meltho/package.nix +++ b/pkgs/by-name/fo/font-misc-meltho/package.nix @@ -18,8 +18,6 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ mkfontscale ]; - configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; - passthru = { updateScript = writeScript "update-${finalAttrs.pname}" '' #!/usr/bin/env nix-shell diff --git a/pkgs/by-name/fo/font-misc-misc/package.nix b/pkgs/by-name/fo/font-misc-misc/package.nix index 2cc4f9c92c49..84cd9d1a1abc 100644 --- a/pkgs/by-name/fo/font-misc-misc/package.nix +++ b/pkgs/by-name/fo/font-misc-misc/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 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"