From 7db78758fa6bb3d61012ce6f548ff008641d14e4 Mon Sep 17 00:00:00 2001 From: Yuriy Taraday Date: Fri, 13 May 2022 20:07:10 +0300 Subject: [PATCH] xorg: Mark several drivers as broken on Darwin Several drivers are built for Darwin on Hydra even though they never worked and probably never will work there. Mark them as broken to avoid wasted cycles. --- pkgs/servers/x11/xorg/overrides.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index b583a72c281..3b670f6b64e 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -15,6 +15,10 @@ let malloc0ReturnsNullCrossFlag = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "--enable-malloc0returnsnull"; + + brokenOnDarwin = pkg: pkg.overrideAttrs (attrs: { + meta = attrs.meta // { broken = isDarwin; }; + }); in self: super: { @@ -388,14 +392,22 @@ self: super: configureFlags = [ "--with-sdkdir=${placeholder "out"}/include/xorg" ]; + meta = attrs.meta // { + broken = isDarwin; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xorg.xf86inputmouse.x86_64-darwin + }; }); xf86inputjoystick = super.xf86inputjoystick.overrideAttrs (attrs: { configureFlags = [ "--with-sdkdir=${placeholder "out"}/include/xorg" ]; + meta = attrs.meta // { + broken = isDarwin; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xorg.xf86inputjoystick.x86_64-darwin + }; }); + xf86inputkeyboard = brokenOnDarwin super.xf86inputkeyboard; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xorg.xf86inputkeyboard.x86_64-darwin + xf86inputlibinput = super.xf86inputlibinput.overrideAttrs (attrs: { outputs = [ "out" "dev" ]; configureFlags = [ @@ -423,6 +435,12 @@ self: super: }; }); + xf86inputvoid = brokenOnDarwin super.xf86inputvoid; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xorg.xf86inputvoid.x86_64-darwin + xf86videodummy = brokenOnDarwin super.xf86videodummy; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xorg.xf86videodummy.x86_64-darwin + xf86videosuncg6 = brokenOnDarwin super.xf86videosuncg6; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xorg.xf86videosuncg6.x86_64-darwin + xf86videosunffb = brokenOnDarwin super.xf86videosunffb; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xorg.xf86videosunffb.x86_64-darwin + xf86videosunleo = brokenOnDarwin super.xf86videosunleo; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xorg.xf86videosunleo.x86_64-darwin + # Obsolete drivers that don't compile anymore. xf86videoark = super.xf86videoark.overrideAttrs (attrs: { meta = attrs.meta // { broken = true; }; }); xf86videogeode = super.xf86videogeode.overrideAttrs (attrs: { meta = attrs.meta // { broken = true; }; });