Unverified Commit 45169f4b authored by quantenzitrone's avatar quantenzitrone
Browse files

font-{{screen,winitzki}-cyrillic,{schumacher,sony,sun}-misc,xfree86-type1}:... 

font-{{screen,winitzki}-cyrillic,{schumacher,sony,sun}-misc,xfree86-type1}: move font from $out/lib to $out/share

for font-xfree86-type1 this fixes xorg nixos module accordingly
parent 157a4e38

nixos/modules/services/x11/xserver.nix

+1 −1
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ let 
    {

      postInstall = ''

        alias='cursor -xfree86-cursor-medium-r-normal--0-${sizeString}-0-0-p-0-adobe-fontspecific'

        echo "$alias" > $out/lib/X11/fonts/Type1/fonts.alias

        echo "$alias" > $out/share/fonts/X11/Type1/fonts.alias

      '';

    }

  );

pkgs/by-name/fo/font-schumacher-misc/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -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/fo/font-screen-cyrillic/package.nix

+0 −2
Original line number Diff line number Diff line
@@ -22,8 +22,6 @@ stdenv.mkDerivation (finalAttrs: { 
    mkfontscale

  ];



  configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];



  passthru = {

    updateScript = writeScript "update-${finalAttrs.pname}" ''

      #!/usr/bin/env nix-shell

pkgs/by-name/fo/font-sony-misc/package.nix

+0 −2
Original line number Diff line number Diff line
@@ -22,8 +22,6 @@ stdenv.mkDerivation (finalAttrs: { 
    mkfontscale

  ];



  configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];



  passthru = {

    updateScript = writeScript "update-${finalAttrs.pname}" ''

      #!/usr/bin/env nix-shell

pkgs/by-name/fo/font-sun-misc/package.nix

+0 −2
Original line number Diff line number Diff line
@@ -22,8 +22,6 @@ stdenv.mkDerivation (finalAttrs: { 
    mkfontscale

  ];



  configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];



  passthru = {

    updateScript = writeScript "update-${finalAttrs.pname}" ''

      #!/usr/bin/env nix-shell