Unverified Commit 2057140a authored by quantenzitrone's avatar quantenzitrone
Browse files

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

relevant changes:
- mark broken on static (didn't build before this pr)
parent 6ffaf747

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

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

  lib,

  stdenv,

  fetchurl,

  pkg-config,

  libxfont_2,

  xorgproto,

  xtrans,

  writeScript,

}:

stdenv.mkDerivation (finalAttrs: {

  pname = "xfs";

  version = "1.2.2";



  src = fetchurl {

    url = "mirror://xorg/individual/app/xfs-${finalAttrs.version}.tar.xz";

    hash = "sha256-twvUYzHiQbMOXgDb3C6rt/P4iAzUQkSs3hPXl20Jjsw=";

  };



  strictDeps = true;



  nativeBuildInputs = [ pkg-config ];



  buildInputs = [

    libxfont_2

    xorgproto

    xtrans

  ];



  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/app/ \

        | sort -V | tail -n1)"

      update-source-version ${finalAttrs.pname} "$version"

    '';

  };



  meta = {

    description = "X Font Server, for X11 core protocol fonts";

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

    license = with lib.licenses; [

      mitOpenGroup

      hpndSellVariant

      x11

      hpnd

    ];

    mainProgram = "xfs";

    maintainers = [ ];

    platforms = lib.platforms.unix;

    broken = stdenv.hostPlatform.isStatic;

  };

})

pkgs/servers/x11/xorg/default.nix

+2 −38
Original line number Diff line number Diff line
@@ -129,6 +129,7 @@ 
  xeyes,

  xfd,

  xfontsel,

  xfs,

  xfsinfo,

  xgamma,

  xgc,
@@ -211,6 +212,7 @@ self: with self; { 
    xeyes

    xfd

    xfontsel

    xfs

    xfsinfo

    xgamma

    xgc
@@ -2114,44 +2116,6 @@ self: with self; { 
    })

  ) { };



  # THIS IS A GENERATED FILE.  DO NOT EDIT!

  xfs = callPackage (

    {

      stdenv,

      pkg-config,

      fetchurl,

      libXfont2,

      xorgproto,

      xtrans,

      testers,

    }:

    stdenv.mkDerivation (finalAttrs: {

      pname = "xfs";

      version = "1.2.2";

      builder = ./builder.sh;

      src = fetchurl {

        url = "mirror://xorg/individual/app/xfs-1.2.2.tar.xz";

        sha256 = "1k4f15nrgmqkvsn48hnl1j4giwxpmcpdrnq0bq7b6hg265ix82xp";

      };

      hardeningDisable = [

        "bindnow"

        "relro"

      ];

      strictDeps = true;

      nativeBuildInputs = [ pkg-config ];

      buildInputs = [

        libXfont2

        xorgproto

        xtrans

      ];

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

      meta = {

        pkgConfigModules = [ ];

        platforms = lib.platforms.unix;

      };

    })

  ) { };



  # THIS IS A GENERATED FILE.  DO NOT EDIT!

  xinit = callPackage (

    {

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

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

  xfd,

  xfontsel,

  xfs,

  xfsinfo,

  xgamma,

  xgc,
@@ -543,6 +544,7 @@ self: with self; { 
    xeyes

    xfd

    xfontsel

    xfs

    xfsinfo

    xgamma

    xgc

pkgs/servers/x11/xorg/overrides.nix

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

  });



  xfs = addMainProgram super.xfs { };

  xinput = addMainProgram super.xinput { };

  xkbevd = addMainProgram super.xkbevd { };

  xkbprint = addMainProgram super.xkbprint { };

pkgs/servers/x11/xorg/tarballs.list

+0 −1
Original line number Diff line number Diff line 
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

mirror://xorg/individual/app/xkbcomp-1.5.0.tar.xz