Unverified Commit 07d3a8f7 authored by quantenzitrone's avatar quantenzitrone
Browse files

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

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

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

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

  lib,

  stdenv,

  fetchFromGitLab,

  autoreconfHook,

  bison,

  pkg-config,

  util-macros,

  libx11,

  libxkbfile,

  nix-update-script,

}:

stdenv.mkDerivation (finalAttrs: {

  pname = "xkbevd";

  version = "1.1.6";



  src = fetchFromGitLab {

    domain = "gitlab.freedesktop.org";

    group = "xorg";

    owner = "app";

    repo = "xkbevd";

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

    hash = "sha256-n/detXvtRvysc5pjFc0Q27yLC2QsNUBo9AIXYkUG4PQ=";

  };



  strictDeps = true;



  nativeBuildInputs = [

    autoreconfHook

    bison

    pkg-config

    util-macros

  ];



  buildInputs = [

    util-macros # unused dependency but the build fails if pkg-config can't find it

    libx11

    libxkbfile

  ];



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



  meta = {

    description = "XKB event daemon";

    longDescription = ''

      The xkbevd event daemon listens for specified XKB events and executes requested commands if

      they occur. The configuration file consists of a list of event specification/action pairs

      and/or variable definitions.

      This command is very raw and is therefore only partially implemented; it is a rough prototype

      for developers, not a general purpose tool for end users.

    '';

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

    license = lib.licenses.hpnd;

    mainProgram = "xkbevd";

    maintainers = [ ];

    platforms = lib.platforms.unix;

  };

})

pkgs/servers/x11/xorg/default.nix

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

  xgc,

  xhost,

  xkbevd,

  xkbprint,

  xkbutils,

  xkeyboard-config,
@@ -214,6 +215,7 @@ self: with self; { 
    xgamma

    xgc

    xhost

    xkbevd

    xkbprint

    xkbutils

    xkill
@@ -2378,42 +2380,6 @@ self: with self; { 
    })

  ) { };



  # THIS IS A GENERATED FILE.  DO NOT EDIT!

  xkbevd = callPackage (

    {

      stdenv,

      pkg-config,

      fetchurl,

      libX11,

      libxkbfile,

      testers,

    }:

    stdenv.mkDerivation (finalAttrs: {

      pname = "xkbevd";

      version = "1.1.6";

      builder = ./builder.sh;

      src = fetchurl {

        url = "mirror://xorg/individual/app/xkbevd-1.1.6.tar.xz";

        sha256 = "0gh73dsf4ic683k9zn2nj9bpff6dmv3gzcb3zx186mpq9kw03d6r";

      };

      hardeningDisable = [

        "bindnow"

        "relro"

      ];

      strictDeps = true;

      nativeBuildInputs = [ pkg-config ];

      buildInputs = [

        libX11

        libxkbfile

      ];

      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,

  xkbevd,

  xkbprint,

  xkbutils,

  xkeyboard-config,
@@ -546,6 +547,7 @@ self: with self; { 
    xgamma

    xgc

    xhost

    xkbevd

    xkbprint

    xkbutils

    xkill

pkgs/servers/x11/xorg/overrides.nix

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

  xfs = addMainProgram super.xfs { };

  xinput = addMainProgram super.xinput { };

  xkbevd = addMainProgram super.xkbevd { };



  xwd = addMainProgram super.xwd { };

}

pkgs/servers/x11/xorg/tarballs.list

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

mirror://xorg/individual/app/xkbevd-1.1.6.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