Unverified Commit 157a4e38 authored by quantenzitrone's avatar quantenzitrone
Browse files

font-xfree86-type1: refactor, move to pkgs/by-name and rename from xorg.fontxfree86type1 

relevant changes:
- remove some unneeded deps and configureFlags

package output doesn't change
parent a8c9ed2a

pkgs/by-name/fo/font-xfree86-type1/package.nix

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

  lib,

  stdenv,

  fetchurl,

  mkfontscale,

  writeScript,

}:

stdenv.mkDerivation (finalAttrs: {

  pname = "font-xfree86-type1";

  version = "1.0.5";



  src = fetchurl {

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

    hash = "sha256-qTwseIpeocACr3yGYs+dmCH7HfUbjSssXgAm39/qSDc=";

  };



  strictDeps = true;



  nativeBuildInputs = [ mkfontscale ];



  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 = "XFree86 Cusrsor Postscript Type 1 Font";

    homepage = "https://gitlab.freedesktop.org/xorg/font/xfree86-type1";

    license = lib.licenses.x11;

    maintainers = [ ];

    platforms = lib.platforms.unix;

  };

})

pkgs/servers/x11/xorg/default.nix

+2 −38
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
  font-sun-misc,

  font-util,

  font-winitzki-cyrillic,

  font-xfree86-type1,

  gccmakedep,

  ico,

  imake,
@@ -152,6 +153,7 @@ self: with self; { 
  fontsunmisc = font-sun-misc;

  fontutil = font-util;

  fontwinitzkicyrillic = font-winitzki-cyrillic;

  fontxfree86type1 = font-xfree86-type1;

  libAppleWM = libapplewm;

  libFS = libfs;

  libICE = libice;
@@ -1195,44 +1197,6 @@ self: with self; { 
    })

  ) { };



  # THIS IS A GENERATED FILE.  DO NOT EDIT!

  fontxfree86type1 = callPackage (

    {

      stdenv,

      pkg-config,

      fetchurl,

      fontutil,

      mkfontscale,

      testers,

    }:

    stdenv.mkDerivation (finalAttrs: {

      pname = "font-xfree86-type1";

      version = "1.0.5";

      builder = ./builder.sh;

      src = fetchurl {

        url = "mirror://xorg/individual/font/font-xfree86-type1-1.0.5.tar.xz";

        sha256 = "0ds8xbgxy9h0bqn2p38vylfzn8cqkp7n51kwmw1c18ayi9w2qg59";

      };

      hardeningDisable = [

        "bindnow"

        "relro"

      ];

      strictDeps = true;

      nativeBuildInputs = [

        pkg-config

        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!

  iceauth = callPackage (

    {

pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl

+2 −0
Original line number Diff line number Diff line
@@ -334,6 +334,7 @@ print OUT <<EOF; 
  font-sun-misc,

  font-util,

  font-winitzki-cyrillic,

  font-xfree86-type1,

  gccmakedep,

  ico,

  imake,
@@ -468,6 +469,7 @@ self: with self; { 
  fontsunmisc = font-sun-misc;

  fontutil = font-util;

  fontwinitzkicyrillic = font-winitzki-cyrillic;

  fontxfree86type1 = font-xfree86-type1;

  libAppleWM = libapplewm;

  libFS = libfs;

  libICE = libice;

pkgs/servers/x11/xorg/tarballs.list

+0 −1
Original line number Diff line number Diff line
@@ -109,7 +109,6 @@ mirror://xorg/individual/font/font-misc-cyrillic-1.0.4.tar.xz 
mirror://xorg/individual/font/font-misc-ethiopic-1.0.5.tar.xz

mirror://xorg/individual/font/font-misc-meltho-1.0.4.tar.xz

mirror://xorg/individual/font/font-misc-misc-1.1.3.tar.xz

mirror://xorg/individual/font/font-xfree86-type1-1.0.5.tar.xz

mirror://xorg/individual/lib/libWindowsWM-1.0.1.tar.bz2

mirror://xorg/individual/lib/libXcomposite-0.4.6.tar.xz

mirror://xorg/individual/lib/libXdamage-1.1.6.tar.xz