xorg: improve splicing situtation

This commit is contained in:
Artturin 2022-11-06 23:59:18 +02:00
parent 1a77429299
commit 6381e4475e
4 changed files with 44 additions and 22 deletions

View file

@ -1,7 +1,7 @@
# THIS IS A GENERATED FILE. DO NOT EDIT!
{ lib, newScope, pixman }:
{ lib, pixman }:
lib.makeScope newScope (self: with self; {
self: with self; {
inherit pixman;
@ -1976,7 +1976,7 @@ lib.makeScope newScope (self: with self; {
}) {};
# THIS IS A GENERATED FILE. DO NOT EDIT!
xdm = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXau, libXaw, libXdmcp, libXext, libXft, libXinerama, libXmu, libXpm, libxcrypt, xorgproto, libXrender, libXt }: stdenv.mkDerivation {
xdm = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXau, libXaw, libXdmcp, libXext, libXft, libXinerama, libXmu, libXpm, xorgproto, libXrender, libXt }: stdenv.mkDerivation {
pname = "xdm";
version = "1.1.12";
builder = ./builder.sh;
@ -1987,7 +1987,7 @@ lib.makeScope newScope (self: with self; {
hardeningDisable = [ "bindnow" "relro" ];
strictDeps = true;
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libX11 libXau libXaw libXdmcp libXext libXft libXinerama libXmu libXpm xorgproto libXrender libXt libxcrypt ];
buildInputs = [ libX11 libXau libXaw libXdmcp libXext libXft libXinerama libXmu libXpm xorgproto libXrender libXt ];
meta.platforms = lib.platforms.unix;
}) {};
@ -3559,4 +3559,4 @@ lib.makeScope newScope (self: with self; {
meta.platforms = lib.platforms.unix;
}) {};
})
}

View file

@ -250,9 +250,9 @@ open OUT, ">default.nix";
print OUT "";
print OUT <<EOF;
# THIS IS A GENERATED FILE. DO NOT EDIT!
{ lib, newScope, pixman }:
{ lib, pixman }:
lib.makeScope newScope (self: with self; {
self: with self; {
inherit pixman;
@ -336,6 +336,6 @@ foreach my $pkg (sort (keys %pkgURLs)) {
EOF
}
print OUT "})\n";
print OUT "}\n";
close OUT;

View file

@ -217,4 +217,4 @@ mirror://xorg/individual/util/lndir-1.0.3.tar.bz2
mirror://xorg/individual/util/makedepend-1.0.6.tar.bz2
mirror://xorg/individual/util/util-macros-1.19.3.tar.bz2
mirror://xorg/individual/util/xorg-cf-files-1.0.7.tar.bz2
mirror://xorg/individual/xserver/xorg-server-1.20.13.tar.xz
mirror://xorg/individual/xserver/xorg-server-1.20.14.tar.xz

View file

@ -24630,19 +24630,41 @@ with pkgs;
inherit (darwin.apple_sdk.libs) Xplugin;
};
# Use `lib.callPackageWith __splicedPackages` rather than plain `callPackage`
# so as not to have the newly bound xorg items already in scope, which would
# have created a cycle.
xorg = recurseIntoAttrs ((lib.callPackageWith __splicedPackages ../servers/x11/xorg {
}).overrideScope' (lib.callPackageWith __splicedPackages ../servers/x11/xorg/overrides.nix {
inherit (darwin.apple_sdk.frameworks) ApplicationServices Carbon Cocoa;
inherit (darwin.apple_sdk.libs) Xplugin;
inherit (buildPackages.darwin) bootstrap_cmds;
udev = if stdenv.isLinux then udev else null;
libdrm = if stdenv.isLinux then libdrm else null;
abiCompat = config.xorg.abiCompat # `config` because we have no `xorg.override`
or (if stdenv.isDarwin then "1.18" else null); # 1.19 needs fixing on Darwin
}));
xorg = let
otherSplices = {
selfBuildBuild = pkgsBuildBuild.xorg;
selfBuildHost = pkgsBuildHost.xorg;
selfBuildTarget = pkgsBuildTarget.xorg;
selfHostHost = pkgsHostHost.xorg;
selfTargetTarget = pkgsTargetTarget.xorg or { };
};
keep = _self: { };
extra = _spliced0: { };
# Use `lib.callPackageWith __splicedPackages` rather than plain `callPackage`
# so as not to have the newly bound xorg items already in scope, which would
# have created a cycle.
overrides = lib.callPackageWith __splicedPackages ../servers/x11/xorg/overrides.nix {
inherit (darwin.apple_sdk.frameworks) ApplicationServices Carbon Cocoa;
inherit (darwin.apple_sdk.libs) Xplugin;
inherit (buildPackages.darwin) bootstrap_cmds;
udev = if stdenv.isLinux then udev else null;
libdrm = if stdenv.isLinux then libdrm else null;
abiCompat = config.xorg.abiCompat # `config` because we have no `xorg.override`
or (if stdenv.isDarwin then "1.18" else null); # 1.19 needs fixing on Darwin
};
generatedPackages = lib.callPackageWith __splicedPackages ../servers/x11/xorg/default.nix {};
xorgPackages = lib.makeScopeWithSplicing
splicePackages
newScope
otherSplices
keep
extra
(lib.extends overrides generatedPackages);
in recurseIntoAttrs xorgPackages;
xorg-autoconf = callPackage ../development/tools/misc/xorg-autoconf { };