sessreg: refactor and move to pkgs/by-name from xorg namespace

This commit is contained in:
Zitrone 2025-04-13 23:49:28 +02:00 committed by Alyssa Ross
parent ae5f858668
commit 5a40acda79
5 changed files with 49 additions and 40 deletions

View file

@ -0,0 +1,45 @@
{
lib,
stdenv,
fetchurl,
pkg-config,
xorgproto,
writeScript,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "sessreg";
version = "1.1.3";
src = fetchurl {
url = "mirror://xorg/individual/app/sessreg-${finalAttrs.version}.tar.xz";
hash = "sha256-AirNXegHfd3E+RmWH3nhAuzV8yKKMzaBr1zQ5zRPrMI=";
};
strictDeps = true;
nativeBuildInputs = [ pkg-config ];
buildInputs = [ xorgproto ];
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 = "Utility to manage utmp & wtmp entries for X sessions";
homepage = "https://gitlab.freedesktop.org/xorg/app/sessreg";
license = with lib.licenses; [
mitOpenGroup
mit
];
mainProgram = "sessreg";
maintainers = [ ];
platforms = lib.platforms.unix;
};
})

View file

@ -13,6 +13,7 @@
luit,
makedepend,
pixman,
sessreg,
util-macros,
xbitmaps,
xcb-proto,
@ -36,6 +37,7 @@ self: with self; {
luit
makedepend
pixman
sessreg
xbitmaps
xorgproto
xtrans
@ -3435,38 +3437,6 @@ self: with self; {
})
) { };
# THIS IS A GENERATED FILE. DO NOT EDIT!
sessreg = callPackage (
{
stdenv,
pkg-config,
fetchurl,
xorgproto,
testers,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "sessreg";
version = "1.1.3";
builder = ./builder.sh;
src = fetchurl {
url = "mirror://xorg/individual/app/sessreg-1.1.3.tar.xz";
sha256 = "1hmc9wsfgl2wmy0kccwa4brxbv02w5wiz5hrz72dsz87x1fwsah2";
};
hardeningDisable = [
"bindnow"
"relro"
];
strictDeps = true;
nativeBuildInputs = [ pkg-config ];
buildInputs = [ xorgproto ];
passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
meta = {
pkgConfigModules = [ ];
platforms = lib.platforms.unix;
};
})
) { };
# THIS IS A GENERATED FILE. DO NOT EDIT!
setxkbmap = callPackage (
{

View file

@ -287,6 +287,7 @@ print OUT <<EOF;
luit,
makedepend,
pixman,
sessreg,
util-macros,
xbitmaps,
xcb-proto,
@ -310,6 +311,7 @@ self: with self; {
luit
makedepend
pixman
sessreg
xbitmaps
xorgproto
xtrans

View file

@ -1354,13 +1354,6 @@ self: super:
};
});
sessreg = super.sessreg.overrideAttrs (attrs: {
preBuild = "sed -i 's|gcc -E|gcc -E -P|' man/Makefile";
meta = attrs.meta // {
mainProgram = "sessreg";
};
});
xrandr = super.xrandr.overrideAttrs (attrs: {
postInstall = ''
rm $out/bin/xkeystone

View file

@ -13,7 +13,6 @@ mirror://xorg/individual/app/ico-1.0.6.tar.xz
mirror://xorg/individual/app/listres-1.0.6.tar.xz
mirror://xorg/individual/app/mkfontscale-1.2.3.tar.xz
mirror://xorg/individual/app/oclock-1.0.5.tar.xz
mirror://xorg/individual/app/sessreg-1.1.3.tar.xz
mirror://xorg/individual/app/setxkbmap-1.3.4.tar.xz
mirror://xorg/individual/app/smproxy-1.0.7.tar.xz
mirror://xorg/individual/app/transset-1.0.3.tar.xz