From 4e8f1086c5b765a8716924039856a6cdd7c76f62 Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Fri, 18 Apr 2025 00:32:44 -0400 Subject: [PATCH] xorg.*: remove several darwin exclusions for several packages These are now successfully built because xorg.xorgserver now ships with xorg-server.pc as expected. Signed-off-by: Ihar Hrachyshka --- pkgs/by-name/xf/xf86-input-joystick/package.nix | 2 +- pkgs/by-name/xf/xf86-input-void/package.nix | 1 - pkgs/by-name/xf/xf86-video-dummy/package.nix | 1 - pkgs/by-name/xf/xf86-video-suncg6/package.nix | 1 - pkgs/by-name/xf/xf86-video-sunffb/package.nix | 1 - pkgs/by-name/xf/xf86-video-sunleo/package.nix | 1 - 6 files changed, 1 insertion(+), 6 deletions(-) diff --git a/pkgs/by-name/xf/xf86-input-joystick/package.nix b/pkgs/by-name/xf/xf86-input-joystick/package.nix index 81df0d68b440..3af25a5bec91 100644 --- a/pkgs/by-name/xf/xf86-input-joystick/package.nix +++ b/pkgs/by-name/xf/xf86-input-joystick/package.nix @@ -52,6 +52,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = [ ]; pkgConfigModules = [ "xorg-joystick" ]; platforms = lib.platforms.unix; - broken = stdenv.hostPlatform.isDarwin; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xf86-input-joystick.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # no darwin driver }; }) diff --git a/pkgs/by-name/xf/xf86-input-void/package.nix b/pkgs/by-name/xf/xf86-input-void/package.nix index 03749b3da67e..17a855f094a6 100644 --- a/pkgs/by-name/xf/xf86-input-void/package.nix +++ b/pkgs/by-name/xf/xf86-input-void/package.nix @@ -54,6 +54,5 @@ stdenv.mkDerivation (finalAttrs: { ]; maintainers = [ ]; platforms = lib.platforms.unix; - broken = stdenv.hostPlatform.isDarwin; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xf86-input-void.x86_64-darwin }; }) diff --git a/pkgs/by-name/xf/xf86-video-dummy/package.nix b/pkgs/by-name/xf/xf86-video-dummy/package.nix index 6bf910666a12..681bf3c9361b 100644 --- a/pkgs/by-name/xf/xf86-video-dummy/package.nix +++ b/pkgs/by-name/xf/xf86-video-dummy/package.nix @@ -47,6 +47,5 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.x11; maintainers = [ ]; platforms = lib.platforms.unix; - broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/pkgs/by-name/xf/xf86-video-suncg6/package.nix b/pkgs/by-name/xf/xf86-video-suncg6/package.nix index 18dc2e1457e1..920e4e98813a 100644 --- a/pkgs/by-name/xf/xf86-video-suncg6/package.nix +++ b/pkgs/by-name/xf/xf86-video-suncg6/package.nix @@ -50,6 +50,5 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.hpndSellVariant; maintainers = [ ]; platforms = lib.platforms.unix; - broken = stdenv.hostPlatform.isDarwin; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xf86-video-suncg6.x86_64-darwin }; }) diff --git a/pkgs/by-name/xf/xf86-video-sunffb/package.nix b/pkgs/by-name/xf/xf86-video-sunffb/package.nix index 823adb0d851f..e67f7a277c1e 100644 --- a/pkgs/by-name/xf/xf86-video-sunffb/package.nix +++ b/pkgs/by-name/xf/xf86-video-sunffb/package.nix @@ -50,6 +50,5 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.mit; maintainers = [ ]; platforms = lib.platforms.unix; - broken = stdenv.hostPlatform.isDarwin; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xf86-video-sunffb.x86_64-darwin }; }) diff --git a/pkgs/by-name/xf/xf86-video-sunleo/package.nix b/pkgs/by-name/xf/xf86-video-sunleo/package.nix index 3b2b97d04693..9be9f6662ed7 100644 --- a/pkgs/by-name/xf/xf86-video-sunleo/package.nix +++ b/pkgs/by-name/xf/xf86-video-sunleo/package.nix @@ -52,6 +52,5 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.mit; maintainers = [ ]; platforms = lib.platforms.unix; - broken = stdenv.hostPlatform.isDarwin; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xf86-video-sunleo.x86_64-darwin }; })