Unverified Commit 9549cb44 authored by quantenzitrone's avatar quantenzitrone
Browse files

xorg.fontbitstreamspeedo: drop

parent e6a9281e

pkgs/servers/x11/xorg/default.nix

+0 −38
Original line number Diff line number Diff line
@@ -394,44 +394,6 @@ self: with self; { 
    })

  ) { };



  # THIS IS A GENERATED FILE.  DO NOT EDIT!

  fontbitstreamspeedo = callPackage (

    {

      stdenv,

      pkg-config,

      fetchurl,

      fontutil,

      mkfontscale,

      testers,

    }:

    stdenv.mkDerivation (finalAttrs: {

      pname = "font-bitstream-speedo";

      version = "1.0.2";

      builder = ./builder.sh;

      src = fetchurl {

        url = "mirror://xorg/individual/font/font-bitstream-speedo-1.0.2.tar.gz";

        sha256 = "0wmy58cd3k7w2j4v20icnfs8z3b61qj3vqdx958z18w00h9mzsmf";

      };

      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!

  fontbitstreamtype1 = callPackage (

    {

pkgs/servers/x11/xorg/overrides.nix

+6 −0
Original line number Diff line number Diff line 
{

  callPackage,

  lib,

  config,

  stdenv,

  makeWrapper,

  fetchurl,
@@ -919,3 +920,8 @@ self: super: 
  mapNamesToAttrs (setLicense lib.licenses.unfreeRedistributable) redist

  // mapNamesToAttrs (setLicense lib.licenses.unfree) unfree

)



# deprecate some packages

// lib.optionalAttrs config.allowAliases {

  fontbitstreamspeedo = throw "Bitstream Speedo is an obsolete font format that hasn't been supported by Xorg since 2005";

}

pkgs/servers/x11/xorg/tarballs.list

+0 −1
Original line number Diff line number Diff line
@@ -73,7 +73,6 @@ mirror://xorg/individual/driver/xf86-video-vmware-13.4.0.tar.xz 
mirror://xorg/individual/driver/xf86-video-voodoo-1.2.6.tar.xz

mirror://xorg/individual/driver/xf86-video-wsfb-0.4.0.tar.bz2

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

mirror://xorg/individual/font/font-bitstream-speedo-1.0.2.tar.gz

mirror://xorg/individual/font/font-bitstream-type1-1.0.4.tar.xz

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

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