Unverified Commit f7416d72 authored by Quentin Smith's avatar Quentin Smith
Browse files

xorg.xorgserver: Fix Xquartz stub on macOS 

Xquartz has been broken since #40574 because the Xquartz binary
couldn't find the corresponding XQuartz.app. This commit restores an
earlier patch to use an environment variable to find XQuartz.app, and
additionally embeds the path to the XQuartz.app's Nix store location
as a default.
parent 90a8b9e3

pkgs/servers/x11/xorg/darwin/stub.patch

0 → 100644
+61 −0
Original line number Diff line number Diff line 
When the X / Xquartz server initializes, it starts the XQuartz.app and

hands-off the display FD. To start the XQuartz.app, Xquartz normally uses some

system calls to get the path of the application by app bundle id, and then

executes the Contents/MacOS/X11 script contained inside, which in turn executes

Contents/MacOS/X11.bin (the actual app).



This patch replaces that discovery technique with a simple call to

`getenv' and a hardcoded default. In order to make Xquartz work if the

app is moved, we'll need another wrapper that sets the `XQUARTZ_X11'

environment variable to point to the `X11' script.



diff --git a/hw/xquartz/mach-startup/stub.c b/hw/xquartz/mach-startup/stub.c

index 83252e805..f1974215b 100644

--- a/hw/xquartz/mach-startup/stub.c

+++ b/hw/xquartz/mach-startup/stub.c

@@ -52,7 +52,6 @@

 

 #include "launchd_fd.h"

 

-static CFURLRef x11appURL;

 static FSRef x11_appRef;

 static pid_t x11app_pid = 0;

 aslclient aslc;

@@ -60,29 +59,21 @@ aslclient aslc;

 static void

 set_x11_path(void)

 {

-    OSStatus osstatus = LSFindApplicationForInfo(kLSUnknownCreator, CFSTR(kX11AppBundleId),

-                                                 nil, &x11_appRef, &x11appURL);

+    unsigned char *xquartzApp = getenv("XQUARTZ_APP");

+    if (!xquartzApp) {

+        xquartzApp = "@XQUARTZ_APP@";

+    }

+

+    OSStatus osstatus = FSPathMakeRef(xquartzApp, &x11_appRef, NULL);

 

     switch (osstatus) {

     case noErr:

-        if (x11appURL == NULL) {

-            asl_log(aslc, NULL, ASL_LEVEL_ERR,

-                    "Xquartz: Invalid response from LSFindApplicationForInfo(%s)",

-                    kX11AppBundleId);

-            exit(1);

-        }

         break;

 

-    case kLSApplicationNotFoundErr:

-        asl_log(aslc, NULL, ASL_LEVEL_ERR,

-                "Xquartz: Unable to find application for %s",

-                kX11AppBundleId);

-        exit(10);

-

     default:

         asl_log(aslc, NULL, ASL_LEVEL_ERR,

-                "Xquartz: Unable to find application for %s, error code = %d",

-                kX11AppBundleId, (int)osstatus);

+                "Xquartz: Unable to find FSRef for %s, error code = %d",

+                xquartzApp, (int)osstatus);

         exit(11);

     }

 }

pkgs/servers/x11/xorg/overrides.nix

+9 −0
Original line number Diff line number Diff line
@@ -763,8 +763,14 @@ self: super: 
            sha256 = "0zm9g0g1jvy79sgkvy0rjm6ywrdba2xjd1nsnjbxjccckbr6i396";

            name = "revert-fb-changes-2.patch";

          })

          ./darwin/stub.patch

        ];



        postPatch = attrs.postPatch + ''

          substituteInPlace hw/xquartz/mach-startup/stub.c \

            --subst-var-by XQUARTZ_APP "$out/Applications/XQuartz.app"

        '';



        configureFlags = [

          # note: --enable-xquartz is auto

          "CPPFLAGS=-I${./darwin/dri}"
@@ -774,6 +780,9 @@ self: super: 
          "--with-apple-applications-dir=\${out}/Applications"

          "--with-bundle-id-prefix=org.nixos.xquartz"

          "--with-sha1=CommonCrypto"

          "--with-xkb-bin-directory=${xorg.xkbcomp}/bin"

          "--with-xkb-path=${xorg.xkeyboardconfig}/share/X11/xkb"

          "--with-xkb-output=$out/share/X11/xkb/compiled"

          "--without-dtrace" # requires Command Line Tools for Xcode

        ];

        preConfigure = ''