font-{{arabic,cursor,daewoo,dec,jis,misc}-misc,ibm-type1,misc-meltho}: move font output to $out/share/fonts/X11

i have no idea why the fonts were in $out/lib/X11/fonts

this also changes the location of font-{cursor,misc}-misc in xdummy

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

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

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

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

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}" ''

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

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

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}" ''

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"