Unverified Commit 2a2dd8db authored by jopejoe1's avatar jopejoe1 Committed by GitHub
Browse files

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

font-{{screen,winitzki}-cyrillic,{schumacher,sony,sun}-misc,xfree86-type1}: refactor, move to pkgs/by-name and rename from xorg namespace (#438711)
parents b341160c 45169f4b

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

0 → 100644
+51 −0
Original line number Diff line number Diff line 
{

  lib,

  stdenv,

  fetchurl,

  pkg-config,

  font-util,

  bdftopcf,

  mkfontscale,

  writeScript,

}:

stdenv.mkDerivation (finalAttrs: {

  pname = "font-schumacher-misc";

  version = "1.1.3";



  src = fetchurl {

    url = "mirror://xorg/individual/font/font-schumacher-misc-${finalAttrs.version}.tar.xz";

    hash = "sha256-i4SfDNseVaNMw92LD7N0Q/q7wiTVukQIVWlYEkSmgHA=";

  };



  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 = "Schumacher pcf fonts";

    homepage = "https://gitlab.freedesktop.org/xorg/font/schumacher-misc";

    license = lib.licenses.hpnd;

    maintainers = [ ];

    platforms = lib.platforms.unix;

  };

})

pkgs/by-name/fo/font-screen-cyrillic/package.nix

0 → 100644
+43 −0
Original line number Diff line number Diff line 
{

  lib,

  stdenv,

  fetchurl,

  bdftopcf,

  mkfontscale,

  writeScript,

}:

stdenv.mkDerivation (finalAttrs: {

  pname = "font-screen-cyrillic";

  version = "1.0.5";



  src = fetchurl {

    url = "mirror://xorg/individual/font/font-screen-cyrillic-${finalAttrs.version}.tar.xz";

    hash = "sha256-j3WLuM1YDH5lVIfR0Ntp0xmsrlTZMrKV2W2dm4P95cA=";

  };



  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 = "Screen Cyrillic pcf font";

    homepage = "https://gitlab.freedesktop.org/xorg/font/screen-cyrillic";

    license = lib.licenses.cronyx;

    maintainers = [ ];

    platforms = lib.platforms.unix;

  };

})

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

0 → 100644
+43 −0
Original line number Diff line number Diff line 
{

  lib,

  stdenv,

  fetchurl,

  bdftopcf,

  mkfontscale,

  writeScript,

}:

stdenv.mkDerivation (finalAttrs: {

  pname = "font-sony-misc";

  version = "1.0.4";



  src = fetchurl {

    url = "mirror://xorg/individual/font/font-sony-misc-${finalAttrs.version}.tar.xz";

    hash = "sha256-5rCfgj/MsG4L0LIGIoO2UUFTMjvYp0hunC4/VauElGs=";

  };



  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 = "Sony pcf fonts";

    homepage = "https://gitlab.freedesktop.org/xorg/font/sony-misc";

    license = lib.licenses.hpnd;

    maintainers = [ ];

    platforms = lib.platforms.unix;

  };

})

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

0 → 100644
+43 −0
Original line number Diff line number Diff line 
{

  lib,

  stdenv,

  fetchurl,

  bdftopcf,

  mkfontscale,

  writeScript,

}:

stdenv.mkDerivation (finalAttrs: {

  pname = "font-sun-misc";

  version = "1.0.4";



  src = fetchurl {

    url = "mirror://xorg/individual/font/font-sun-misc-${finalAttrs.version}.tar.xz";

    hash = "sha256-3YTdEW2Sev+k+g+ilyez7PwPBkI4gXwKHlUqCsOE258=";

  };



  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 = "Open Look Glyph and Cursor pcf fonts";

    homepage = "https://gitlab.freedesktop.org/xorg/font/sun-misc/";

    license = lib.licenses.mit;

    maintainers = [ ];

    platforms = lib.platforms.unix;

  };

})