Unverified Commit 6ffaf747 authored by quantenzitrone's avatar quantenzitrone
Browse files

xfd: refactor & move to pkgs/by-name from xorg namespace 

relevant changes:
- switch to gitlab source instead of release tarball
parent 021ca53e

pkgs/by-name/xf/xfd/package.nix

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

  lib,

  stdenv,

  fetchFromGitLab,

  autoreconfHook,

  pkg-config,

  util-macros,

  wrapWithXFileSearchPathHook,

  fontconfig,

  libxaw,

  libxft,

  libxkbfile,

  libxmu,

  libxrender,

  libxt,

  xorgproto,

  nix-update-script,

}:

stdenv.mkDerivation (finalAttrs: {

  pname = "xfd";

  version = "1.1.4";



  src = fetchFromGitLab {

    domain = "gitlab.freedesktop.org";

    group = "xorg";

    owner = "app";

    repo = "xfd";

    tag = "xfd-${finalAttrs.version}";

    hash = "sha256-8kkoJILNlVgDIV029mF3err6es5V001FQqUnTtD9/LQ=";

  };



  strictDeps = true;



  nativeBuildInputs = [

    autoreconfHook

    pkg-config

    util-macros

    wrapWithXFileSearchPathHook

  ];



  buildInputs = [

    fontconfig

    libxaw

    libxft

    libxkbfile

    libxmu

    libxrender

    libxt

    xorgproto

  ];



  installFlags = [ "appdefaultdir=$out/share/X11/app-defaults" ];



  passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex=xfd-(.*)" ]; };



  meta = {

    description = "X font display utility, using either the X11 core protocol or libXft2.";

    homepage = "https://gitlab.freedesktop.org/xorg/app/xfd";

    license = lib.licenses.mitOpenGroup;

    mainProgram = "xfd";

    maintainers = [ ];

    platforms = lib.platforms.unix;

  };

})

pkgs/servers/x11/xorg/default.nix

+2 −54
Original line number Diff line number Diff line
@@ -127,6 +127,7 @@ 
  xdriinfo,

  xev,

  xeyes,

  xfd,

  xfontsel,

  xfsinfo,

  xgamma,
@@ -208,6 +209,7 @@ self: with self; { 
    xdriinfo

    xev

    xeyes

    xfd

    xfontsel

    xfsinfo

    xgamma
@@ -2112,60 +2114,6 @@ self: with self; { 
    })

  ) { };



  # THIS IS A GENERATED FILE.  DO NOT EDIT!

  xfd = callPackage (

    {

      stdenv,

      pkg-config,

      fetchurl,

      libxkbfile,

      fontconfig,

      libXaw,

      libXft,

      libXmu,

      xorgproto,

      libXrender,

      libXt,

      gettext,

      wrapWithXFileSearchPathHook,

      testers,

    }:

    stdenv.mkDerivation (finalAttrs: {

      pname = "xfd";

      version = "1.1.4";

      builder = ./builder.sh;

      src = fetchurl {

        url = "mirror://xorg/individual/app/xfd-1.1.4.tar.xz";

        sha256 = "1zbnj0z28dx2rm2h7pjwcz7z1jnl28gz0v9xn3hs2igxcvxhyiym";

      };

      hardeningDisable = [

        "bindnow"

        "relro"

      ];

      strictDeps = true;

      nativeBuildInputs = [

        pkg-config

        gettext

        wrapWithXFileSearchPathHook

      ];

      buildInputs = [

        libxkbfile

        fontconfig

        libXaw

        libXft

        libXmu

        xorgproto

        libXrender

        libXt

      ];

      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;

      meta = {

        pkgConfigModules = [ ];

        platforms = lib.platforms.unix;

      };

    })

  ) { };



  # THIS IS A GENERATED FILE.  DO NOT EDIT!

  xfs = callPackage (

    {

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

+2 −0
Original line number Diff line number Diff line
@@ -459,6 +459,7 @@ print OUT <<EOF; 
  xdriinfo,

  xev,

  xeyes,

  xfd,

  xfontsel,

  xfsinfo,

  xgamma,
@@ -540,6 +541,7 @@ self: with self; { 
    xdriinfo

    xev

    xeyes

    xfd

    xfontsel

    xfsinfo

    xgamma

pkgs/servers/x11/xorg/overrides.nix

+0 −1
Original line number Diff line number Diff line
@@ -421,7 +421,6 @@ self: super: 
    ];

  });



  xfd = addMainProgram super.xfd { };

  xfs = addMainProgram super.xfs { };

  xinput = addMainProgram super.xinput { };

  xkbevd = addMainProgram super.xkbevd { };

pkgs/servers/x11/xorg/tarballs.list

+0 −1
Original line number Diff line number Diff line 
mirror://xorg/individual/app/xfd-1.1.4.tar.xz

mirror://xorg/individual/app/xfs-1.2.2.tar.xz

mirror://xorg/individual/app/xinit-1.4.4.tar.xz

mirror://xorg/individual/app/xinput-1.6.4.tar.xz