swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-20 12:29:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

x11: sort pkg-config modules

Browse source
This commit is contained in:
K900 2024-01-16 18:45:23 +03:00
parent bb121a85e7
commit fa83d552b8
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/servers/x11/xorg/default.nix
View file

@ -1450,7 +1450,7 @@ self: with self; {
buildInputs = [ libX11 libXext xorgproto libXt ];
passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
meta = {
pkgConfigModules = [ "xmuu" "xmu" ];
pkgConfigModules = [ "xmu" "xmuu" ];
platforms = lib.platforms.unix;
};
})) {};
@ -1650,7 +1650,7 @@ self: with self; {
buildInputs = [ xorgproto libX11 libXext libXv ];
passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
meta = {
pkgConfigModules = [ "xvmc-wrapper" "xvmc" ];
pkgConfigModules = [ "xvmc" "xvmc-wrapper" ];
platforms = lib.platforms.unix;
};
})) {};
@ -1811,7 +1811,7 @@ self: with self; {
buildInputs = [ libxslt libpthreadstubs libXau xcbproto libXdmcp ];
passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
meta = {
pkgConfigModules = [ "xcb-composite" "xcb-xtest" "xcb-record" "xcb-glx" "xcb-dpms" "xcb-xevie" "xcb-dri2" "xcb-shm" "xcb-sync" "xcb-xprint" "xcb-dri3" "xcb-screensaver" "xcb-render" "xcb-xkb" "xcb-xinput" "xcb-shape" "xcb-ge" "xcb-xfixes" "xcb" "xcb-damage" "xcb-present" "xcb-xf86dri" "xcb-xvmc" "xcb-randr" "xcb-xinerama" "xcb-xselinux" "xcb-xv" "xcb-res" ];
pkgConfigModules = [ "xcb" "xcb-composite" "xcb-damage" "xcb-dbe" "xcb-dpms" "xcb-dri2" "xcb-dri3" "xcb-ge" "xcb-glx" "xcb-present" "xcb-randr" "xcb-record" "xcb-render" "xcb-res" "xcb-screensaver" "xcb-shape" "xcb-shm" "xcb-sync" "xcb-xevie" "xcb-xf86dri" "xcb-xfixes" "xcb-xinerama" "xcb-xinput" "xcb-xkb" "xcb-xprint" "xcb-xselinux" "xcb-xtest" "xcb-xv" "xcb-xvmc" ];
platforms = lib.platforms.unix;
};
})) {};
@ -2271,7 +2271,7 @@ self: with self; {
buildInputs = [ gperf libxcb xorgproto ];
passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
meta = {
pkgConfigModules = [ "xcb-atom" "xcb-event" "xcb-aux" "xcb-util" ];
pkgConfigModules = [ "xcb-atom" "xcb-aux" "xcb-event" "xcb-util" ];
platforms = lib.platforms.unix;
};
})) {};
@ -2391,7 +2391,7 @@ self: with self; {
buildInputs = [ gperf libxcb xorgproto ];
passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
meta = {
pkgConfigModules = [ "xcb-icccm" "xcb-ewmh" ];
pkgConfigModules = [ "xcb-ewmh" "xcb-icccm" ];
platforms = lib.platforms.unix;
};
})) {};
@ -4151,7 +4151,7 @@ self: with self; {
buildInputs = [ libXt ];
passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
meta = {
pkgConfigModules = [ "xf86vidmodeproto" "xineramaproto" "xproxymngproto" "glproto" "presentproto" "applewmproto" "xcmiscproto" "recordproto" "resourceproto" "printproto" "xcalibrateproto" "renderproto" "fontsproto" "dpmsproto" "kbproto" "videoproto" "dri2proto" "bigreqsproto" "dri3proto" "evieproto" "inputproto" "fixesproto" "lg3dproto" "xf86rushproto" "compositeproto" "xwaylandproto" "trapproto" "dmxproto" "xextproto" "xproto" "xf86dgaproto" "xf86miscproto" "xf86bigfontproto" "windowswmproto" "scrnsaverproto" "damageproto" "xf86driproto" "randrproto" "fontcacheproto" ];
pkgConfigModules = [ "applewmproto" "bigreqsproto" "compositeproto" "damageproto" "dmxproto" "dpmsproto" "dri2proto" "dri3proto" "evieproto" "fixesproto" "fontcacheproto" "fontsproto" "glproto" "inputproto" "kbproto" "lg3dproto" "presentproto" "printproto" "randrproto" "recordproto" "renderproto" "resourceproto" "scrnsaverproto" "trapproto" "videoproto" "windowswmproto" "xcalibrateproto" "xcmiscproto" "xextproto" "xf86bigfontproto" "xf86dgaproto" "xf86driproto" "xf86miscproto" "xf86rushproto" "xf86vidmodeproto" "xineramaproto" "xproto" "xproxymngproto" "xwaylandproto" ];
platforms = lib.platforms.unix;
};
})) {};

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

@ -332,7 +332,7 @@ foreach my $pkg (sort (keys %pkgURLs)) {
my $pcProvidesStr = "";
if (defined $pcProvides{$pkg}) {
$pcProvidesStr = join "", map { "\"" . $_ . "\" " } @{$pcProvides{$pkg}};
$pcProvidesStr = join "", map { "\"" . $_ . "\" " } (sort @{$pcProvides{$pkg}});
}
print OUT <<EOF