Revert "Revert "xorg-server: re-enable strictflexarrays1 on darwin""

Merge master into staging-nixos
2026-08-26 02:05:02 +00:00 · 2026-08-18 11:12:30 +02:00 · 2026-08-18 06:09:32 +00:00 · 2026-08-18 00:12:12 +00:00
2 changed files with 9 additions and 3 deletions
--- a/pkgs/by-name/xo/xorg-server/package.nix
+++ b/pkgs/by-name/xo/xorg-server/package.nix
@@ -176,9 +176,6 @@ stdenv.mkDerivation (finalAttrs: {
      --subst-var-by XQUARTZ_APP "$out/Applications/XQuartz.app"
  '';

-  # avoid linux rebuilds
-  ${if stdenv.hostPlatform.isDarwin then "hardeningDisable" else null} = [ "strictflexarrays1" ];
-
  # default X install symlinks this to Xorg, we want XQuartz
  postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
    ln -sf $out/bin/Xquartz $out/bin/X
--- a/pkgs/by-name/xt/xtrans/package.nix
+++ b/pkgs/by-name/xt/xtrans/package.nix
@@ -2,6 +2,7 @@
  lib,
  stdenv,
  fetchurl,
+  fetchpatch,
  pkg-config,
  writeScript,
  testers,
@@ -15,6 +16,14 @@ stdenv.mkDerivation (finalAttrs: {
    hash = "sha256-+q/qFmvyRRoXPZ1ZM1KUDsZAQUXF0dpcITQjzk01npI=";
  };

+  patches = [
+    # fix darwin crashes with fortify when using launchctl socket activation
+    (fetchpatch {
+      url = "https://gitlab.freedesktop.org/xorg/lib/libxtrans/-/commit/79f6b0bfe2170496e8c37626043d009f4cd3f1e1.patch";
+      hash = "sha256-Y8QY1yAiOI/rSNi71/Qhsn6UEql556/pS2av7+vmGQA=";
+    })
+  ];
+
  strictDeps = true;

  nativeBuildInputs = [ pkg-config ];
Author	SHA1	Message	Date
Vladimír Čunát	df202c61a0	Revert "Revert "xorg-server: re-enable strictflexarrays1 on darwin""	2026-08-18 11:12:30 +02:00
nixpkgs-ci[bot]	8ff4cc7665	Merge master into staging-nixos	2026-08-18 06:09:32 +00:00
nixpkgs-ci[bot]	7f87bd28f1	Merge master into staging-nixos	2026-08-18 00:12:12 +00:00