gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libx{vmc,xf86{dga,misc,vm}}: refactor, move to pkgs/by-name and rename from xorg namespace (#434833)

Browse Source
This commit is contained in:
jopejoe1
2025-08-26 22:28:01 +02:00
committed by GitHub
parent 9d9f6b3d0d f5077a75cf
commit 2ba623896b
8 changed files with 263 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/by-name/li/libxvmc/package.nix
+68
View File
@@ -0,0 +1,68 @@
{
lib,
stdenv,
fetchurl,
pkg-config,
xorgproto,
libX11,
libXext,
libXv,
writeScript,
testers,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "libxvmc";
version = "1.0.14";
outputs = [
"out"
"dev"
"doc"
];
src = fetchurl {
url = "mirror://xorg/individual/lib/libXvMC-${finalAttrs.version}.tar.xz";
hash = "sha256-5L6etra6/bv4H0f3FjBHIVN25F4tx4bQ6mGByTByXtk=";
};
strictDeps = true;
nativeBuildInputs = [ pkg-config ];
buildInputs = [
xorgproto
libX11
libXext
libXv
];
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 libXvMC \
--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 = "X-Video Motion Compensation API";
homepage = "https://gitlab.freedesktop.org/xorg/lib/libxvmc";
license = lib.licenses.mit;
maintainers = [ ];
pkgConfigModules = [
"xvmc"
"xvmc-wrapper"
];
platforms = lib.platforms.unix;
};
})
pkgs/by-name/li/libxxf86dga/package.nix
+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;
};
})
pkgs/by-name/li/libxxf86misc/package.nix
+57
View File
@@ -0,0 +1,57 @@
{
lib,
stdenv,
fetchurl,
pkg-config,
xorgproto,
libx11,
libxext,
writeScript,
testers,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "libxxf86misc";
version = "1.0.4";
src = fetchurl {
url = "mirror://xorg/individual/lib/libXxf86misc-${finalAttrs.version}.tar.bz2";
hash = "sha256-qJwD4rDxYjnWeiAxuQA/MbWmhhBrvbPHl/uIrkcq84A=";
};
strictDeps = true;
nativeBuildInputs = [ pkg-config ];
buildInputs = [
xorgproto
libx11
libxext
];
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 libXxf86misc \
--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 = "Extension library for the XFree86-Misc X extension";
homepage = "https://gitlab.freedesktop.org/xorg/lib/libxxf86misc";
license = lib.licenses.x11;
maintainers = [ ];
pkgConfigModules = [ "xxf86misc" ];
platforms = lib.platforms.unix;
};
})
pkgs/by-name/li/libxxf86vm/package.nix
+60
View File
@@ -0,0 +1,60 @@
{
lib,
stdenv,
fetchurl,
pkg-config,
libX11,
libXext,
xorgproto,
writeScript,
testers,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "libxxf86vm";
version = "1.1.6";
outputs = [
"out"
"dev"
];
src = fetchurl {
url = "mirror://xorg/individual/lib/libXxf86vm-${finalAttrs.version}.tar.xz";
hash = "sha256-lq9BTHPOHVRJrQS+f58n+oMw+ES23ahD7yLj4b77PuM=";
};
strictDeps = true;
nativeBuildInputs = [ pkg-config ];
buildInputs = [
libX11
libXext
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 libXxf86vm \
--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 = "Extension library for the XFree86-VidMode X extension";
homepage = "https://gitlab.freedesktop.org/xorg/lib/libxxf86vm";
license = lib.licenses.x11;
maintainers = [ ];
pkgConfigModules = [ "xxf86vm" ];
platforms = lib.platforms.unix;
};
})
pkgs/servers/x11/xorg/default.nix
+8 -157
View File
@@ -30,6 +30,10 @@
libxrender,
libxt,
libxv,
libxvmc,
libxxf86dga,
libxxf86misc,
libxxf86vm,
lndir,
luit,
makedepend,
@@ -111,6 +115,10 @@ self: with self; {
libXrender = libxrender;
libXt = libxt;
libXv = libxv;
libXvMC = libxvmc;
libXxf86dga = libxxf86dga;
libXxf86misc = libxxf86misc;
libXxf86vm = libxxf86vm;
utilmacros = util-macros;
xcbproto = xcb-proto;
xkeyboardconfig = xkeyboard-config;
@@ -2309,163 +2317,6 @@ self: with self; {
})
) { };
# THIS IS A GENERATED FILE. DO NOT EDIT!
libXvMC = callPackage (
{
stdenv,
pkg-config,
fetchurl,
xorgproto,
libX11,
libXext,
libXv,
testers,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "libXvMC";
version = "1.0.14";
builder = ./builder.sh;
src = fetchurl {
url = "mirror://xorg/individual/lib/libXvMC-1.0.14.tar.xz";
sha256 = "1nayf8qck0b1xb88dirdbvj7clr18wq1dxs73zwbpzdsnsv9xgp4";
};
hardeningDisable = [
"bindnow"
"relro"
];
strictDeps = true;
nativeBuildInputs = [ pkg-config ];
buildInputs = [
xorgproto
libX11
libXext
libXv
];
passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
meta = {
pkgConfigModules = [
"xvmc"
"xvmc-wrapper"
];
platforms = lib.platforms.unix;
};
})
) { };
# 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 (
{
stdenv,
pkg-config,
fetchurl,
libX11,
libXext,
xorgproto,
testers,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "libXxf86misc";
version = "1.0.4";
builder = ./builder.sh;
src = fetchurl {
url = "mirror://xorg/individual/lib/libXxf86misc-1.0.4.tar.bz2";
sha256 = "107k593sx27vjz3v7gbb223add9i7w0bjc90gbb3jqpin3i07758";
};
hardeningDisable = [
"bindnow"
"relro"
];
strictDeps = true;
nativeBuildInputs = [ pkg-config ];
buildInputs = [
libX11
libXext
xorgproto
];
passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
meta = {
pkgConfigModules = [ "xxf86misc" ];
platforms = lib.platforms.unix;
};
})
) { };
# THIS IS A GENERATED FILE. DO NOT EDIT!
libXxf86vm = callPackage (
{
stdenv,
pkg-config,
fetchurl,
libX11,
libXext,
xorgproto,
testers,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "libXxf86vm";
version = "1.1.6";
builder = ./builder.sh;
src = fetchurl {
url = "mirror://xorg/individual/lib/libXxf86vm-1.1.6.tar.xz";
sha256 = "1qryzfzf3qr2xx1sipdn8kw310zs4ygpzgh4mm4m87fffd643bwn";
};
hardeningDisable = [
"bindnow"
"relro"
];
strictDeps = true;
nativeBuildInputs = [ pkg-config ];
buildInputs = [
libX11
libXext
xorgproto
];
passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
meta = {
pkgConfigModules = [ "xxf86vm" ];
platforms = lib.platforms.unix;
};
})
) { };
# THIS IS A GENERATED FILE. DO NOT EDIT!
libxkbfile = callPackage (
{
pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+13
View File
@@ -63,6 +63,11 @@ $pcMap{"xrender"} = "libXrender";
$pcMap{"xt"} = "libXt";
$pcMap{"xtrans"} = "xtrans";
$pcMap{"xv"} = "libXv";
$pcMap{"xvmc"} = "libXvMC";
$pcMap{"xvmc-wrapper"} = "libXvMC";
$pcMap{"xxf86dga"} = "libXxf86dga";
$pcMap{"xxf86misc"} = "libXxf86misc";
$pcMap{"xxf86vm"} = "libXxf86vm";
$pcMap{"\$PIXMAN"} = "pixman";
$pcMap{"\$RENDERPROTO"} = "xorgproto";
$pcMap{"\$DRI3PROTO"} = "xorgproto";
@@ -331,6 +336,10 @@ print OUT <<EOF;
libxrender,
libxt,
libxv,
libxvmc,
libxxf86dga,
libxxf86misc,
libxxf86vm,
lndir,
luit,
makedepend,
@@ -412,6 +421,10 @@ self: with self; {
libXrender = libxrender;
libXt = libxt;
libXv = libxv;
libXvMC = libxvmc;
libXxf86dga = libxxf86dga;
libXxf86misc = libxxf86misc;
libXxf86vm = libxxf86vm;
utilmacros = util-macros;
xcbproto = xcb-proto;
xkeyboardconfig = xkeyboard-config;
pkgs/servers/x11/xorg/overrides.nix
-23
View File
@@ -166,19 +166,6 @@ self: super:
configureFlags = lib.optional isDarwin "CFLAGS=-O0";
});
libXxf86vm = super.libXxf86vm.overrideAttrs (attrs: {
outputs = [
"out"
"dev"
];
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;
});
libWindowsWM = super.libWindowsWM.overrideAttrs (attrs: {
configureFlags = attrs.configureFlags or [ ] ++ malloc0ReturnsNullCrossFlag;
});
@@ -294,16 +281,6 @@ self: super:
configureFlags = attrs.configureFlags or [ ] ++ malloc0ReturnsNullCrossFlag;
});
libXvMC = super.libXvMC.overrideAttrs (attrs: {
outputs = [
"out"
"dev"
"doc"
];
configureFlags = attrs.configureFlags or [ ] ++ malloc0ReturnsNullCrossFlag;
buildInputs = attrs.buildInputs ++ [ xorg.xorgproto ];
});
libXp = super.libXp.overrideAttrs (attrs: {
outputs = [
"out"
pkgs/servers/x11/xorg/tarballs.list
-4
View File
@@ -157,9 +157,5 @@ mirror://xorg/individual/lib/libXScrnSaver-1.2.4.tar.xz
mirror://xorg/individual/lib/libxshmfence-1.3.3.tar.xz
mirror://xorg/individual/lib/libXTrap-1.0.1.tar.bz2
mirror://xorg/individual/lib/libXtst-1.2.5.tar.xz
mirror://xorg/individual/lib/libXvMC-1.0.14.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
mirror://xorg/individual/xserver/xorg-server-21.1.18.tar.xz