Unverified Commit f39daba5 authored by quantenzitrone's avatar quantenzitrone
Browse files

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

relevant changes:
- switch to GitLab source instead of release tarball
parent 8c518a6f

pkgs/by-name/xk/xkbprint/package.nix

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

  lib,

  stdenv,

  fetchFromGitLab,

  autoreconfHook,

  pkg-config,

  util-macros,

  libx11,

  libxkbfile,

  xorgproto,

  nix-update-script,

}:

stdenv.mkDerivation (finalAttrs: {

  pname = "xkbprint";

  version = "1.0.7";



  src = fetchFromGitLab {

    domain = "gitlab.freedesktop.org";

    group = "xorg";

    owner = "app";

    repo = "xkbprint";

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

    hash = "sha256-JcVXwhEV6tTdgBNki7MuUPjjZOjVE83uBP/yc+ShycE=";

  };



  strictDeps = true;



  nativeBuildInputs = [

    autoreconfHook

    pkg-config

    util-macros

  ];



  buildInputs = [

    libx11

    libxkbfile

    xorgproto

  ];



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



  meta = {

    description = "Generates a PostScript image of an XKB keyboard description.";

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

    license = with lib.licenses; [

      hpnd

      hpndDec

    ];

    mainProgram = "xkbprint";

    maintainers = [ ];

    platforms = lib.platforms.unix;

  };

})

pkgs/servers/x11/xorg/default.nix

+2 −38
Original line number Diff line number Diff line
@@ -131,6 +131,7 @@ 
  xgamma,

  xgc,

  xhost,

  xkbprint,

  xkbutils,

  xkeyboard-config,

  xkill,
@@ -213,6 +214,7 @@ self: with self; { 
    xgamma

    xgc

    xhost

    xkbprint

    xkbutils

    xkill

    xload
@@ -2412,44 +2414,6 @@ self: with self; { 
    })

  ) { };



  # THIS IS A GENERATED FILE.  DO NOT EDIT!

  xkbprint = callPackage (

    {

      stdenv,

      pkg-config,

      fetchurl,

      libX11,

      libxkbfile,

      xorgproto,

      testers,

    }:

    stdenv.mkDerivation (finalAttrs: {

      pname = "xkbprint";

      version = "1.0.7";

      builder = ./builder.sh;

      src = fetchurl {

        url = "mirror://xorg/individual/app/xkbprint-1.0.7.tar.xz";

        sha256 = "1k2rm8lvc2klcdz2s3mymb9a2ahgwqwkgg67v3phv7ij6304jkqw";

      };

      hardeningDisable = [

        "bindnow"

        "relro"

      ];

      strictDeps = true;

      nativeBuildInputs = [ pkg-config ];

      buildInputs = [

        libX11

        libxkbfile

        xorgproto

      ];

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

      meta = {

        pkgConfigModules = [ ];

        platforms = lib.platforms.unix;

      };

    })

  ) { };



  # THIS IS A GENERATED FILE.  DO NOT EDIT!

  xtrap = callPackage (

    {

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

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

  xgc,

  xhost,

  xkbprint,

  xkbutils,

  xkeyboard-config,

  xkill,
@@ -545,6 +546,7 @@ self: with self; { 
    xgamma

    xgc

    xhost

    xkbprint

    xkbutils

    xkill

    xload

pkgs/servers/x11/xorg/overrides.nix

+0 −1
Original line number Diff line number Diff line
@@ -427,7 +427,6 @@ self: super: 
  xfs = addMainProgram super.xfs { };

  xinput = addMainProgram super.xinput { };

  xkbevd = addMainProgram super.xkbevd { };

  xkbprint = addMainProgram super.xkbprint { };



  xwd = addMainProgram super.xwd { };

}

pkgs/servers/x11/xorg/tarballs.list

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

mirror://xorg/individual/app/xkbevd-1.1.6.tar.xz

mirror://xorg/individual/app/xkbprint-1.0.7.tar.xz

mirror://xorg/individual/app/xtrap-1.0.3.tar.bz2

mirror://xorg/individual/app/xwd-1.0.9.tar.xz

mirror://xorg/individual/driver/xf86-input-evdev-2.11.0.tar.xz