libxxf86dga: refactor, move to pkgs/by-name and rename from xorg.libXxf86dga

This commit is contained in:
quantenzitrone
2025-08-19 15:33:50 +02:00
parent b7a50d3f53
commit 809bf617cf
5 changed files with 62 additions and 42 deletions
+57
View File
@@ -0,0 +1,57 @@
{
lib,
stdenv,
fetchurl,
pkg-config,
libX11,
libXext,
xorgproto,
writeScript,
testers,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "libxxf86dga";
version = "1.1.6";
src = fetchurl {
url = "mirror://xorg/individual/lib/libXxf86dga-${finalAttrs.version}.tar.xz";
hash = "sha256-vkRCdXmAj+OiF9WfUcrnVqJpE+tuTIc4zKtl/1bXmA8=";
};
strictDeps = true;
nativeBuildInputs = [ pkg-config ];
buildInputs = [
libX11
libXext
xorgproto
];
propagatedBuildInputs = [ xorgproto ];
configureFlags = lib.optional (
stdenv.hostPlatform != stdenv.buildPlatform
) "--enable-malloc0returnsnull";
passthru = {
updateScript = writeScript "update-${finalAttrs.pname}" ''
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p common-updater-scripts
version="$(list-directory-versions --pname libXxf86dga \
--url https://xorg.freedesktop.org/releases/individual/lib/ \
| sort -V | tail -n1)"
update-source-version ${finalAttrs.pname} "$version"
'';
tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
};
meta = {
description = "Client library for the XFree86-DGA extension";
homepage = "https://gitlab.freedesktop.org/xorg/lib/libxxf86dga";
license = lib.licenses.x11;
maintainers = [ ];
pkgConfigModules = [ "xxf86dga" ];
platforms = lib.platforms.unix;
};
})
+2 -38
View File
@@ -25,6 +25,7 @@
libxrender,
libxv,
libxvmc,
libxxf86dga,
lndir,
luit,
makedepend,
@@ -101,6 +102,7 @@ self: with self; {
libXrender = libxrender;
libXv = libxv;
libXvMC = libxvmc;
libXxf86dga = libxxf86dga;
utilmacros = util-macros;
xcbproto = xcb-proto;
xkeyboardconfig = xkeyboard-config;
@@ -2547,44 +2549,6 @@ self: with self; {
})
) { };
# THIS IS A GENERATED FILE. DO NOT EDIT!
libXxf86dga = callPackage (
{
stdenv,
pkg-config,
fetchurl,
libX11,
libXext,
xorgproto,
testers,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "libXxf86dga";
version = "1.1.6";
builder = ./builder.sh;
src = fetchurl {
url = "mirror://xorg/individual/lib/libXxf86dga-1.1.6.tar.xz";
sha256 = "03wqsxbgyrdbrhw8fk3fxc9nk8jnwz5537ym2yif73w0g5sl4i5y";
};
hardeningDisable = [
"bindnow"
"relro"
];
strictDeps = true;
nativeBuildInputs = [ pkg-config ];
buildInputs = [
libX11
libXext
xorgproto
];
passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
meta = {
pkgConfigModules = [ "xxf86dga" ];
platforms = lib.platforms.unix;
};
})
) { };
# THIS IS A GENERATED FILE. DO NOT EDIT!
libXxf86misc = callPackage (
{
@@ -57,6 +57,7 @@ $pcMap{"xtrans"} = "xtrans";
$pcMap{"xv"} = "libXv";
$pcMap{"xvmc"} = "libXvMC";
$pcMap{"xvmc-wrapper"} = "libXvMC";
$pcMap{"xxf86dga"} = "libXxf86dga";
$pcMap{"\$PIXMAN"} = "pixman";
$pcMap{"\$RENDERPROTO"} = "xorgproto";
$pcMap{"\$DRI3PROTO"} = "xorgproto";
@@ -320,6 +321,7 @@ print OUT <<EOF;
libxrender,
libxv,
libxvmc,
libxxf86dga,
lndir,
luit,
makedepend,
@@ -396,6 +398,7 @@ self: with self; {
libXrender = libxrender;
libXv = libxv;
libXvMC = libxvmc;
libXxf86dga = libxxf86dga;
utilmacros = util-macros;
xcbproto = xcb-proto;
xkeyboardconfig = xkeyboard-config;
-3
View File
@@ -173,9 +173,6 @@ self: super:
];
configureFlags = attrs.configureFlags or [ ] ++ malloc0ReturnsNullCrossFlag;
});
libXxf86dga = super.libXxf86dga.overrideAttrs (attrs: {
configureFlags = attrs.configureFlags or [ ] ++ malloc0ReturnsNullCrossFlag;
});
libXxf86misc = super.libXxf86misc.overrideAttrs (attrs: {
configureFlags = attrs.configureFlags or [ ] ++ malloc0ReturnsNullCrossFlag;
});
-1
View File
@@ -163,7 +163,6 @@ mirror://xorg/individual/lib/libxshmfence-1.3.3.tar.xz
mirror://xorg/individual/lib/libXTrap-1.0.1.tar.bz2
mirror://xorg/individual/lib/libXt-1.3.1.tar.xz
mirror://xorg/individual/lib/libXtst-1.2.5.tar.xz
mirror://xorg/individual/lib/libXxf86dga-1.1.6.tar.xz
mirror://xorg/individual/lib/libXxf86misc-1.0.4.tar.bz2
mirror://xorg/individual/lib/libXxf86vm-1.1.6.tar.xz
mirror://xorg/individual/lib/xcb-util-cursor-0.1.5.tar.xz