Unverified Commit f1290bdf authored by Masum Reza's avatar Masum Reza Committed by GitHub
Browse files

Merge pull request #337203 from youwen5/patch-hyprland-asahi

hyprland: patch to work properly on apple silicon
parents 6ab787a9 51bc0648
Loading
Loading
Loading
Loading
+15 −0
Original line number Diff line number Diff line
diff --git a/src/protocols/LinuxDMABUF.cpp b/src/protocols/LinuxDMABUF.cpp
index 0fbf832e..c6077114 100644
--- a/src/protocols/LinuxDMABUF.cpp
+++ b/src/protocols/LinuxDMABUF.cpp
@@ -492,9 +492,8 @@ CLinuxDMABufV1Protocol::CLinuxDMABufV1Protocol(const wl_interface* iface, const
                 return;
             }
         } else {
-            protoLog(ERR, "DRM device {} has no render node, disabling linux dmabuf", device->nodes[DRM_NODE_PRIMARY] ? device->nodes[DRM_NODE_PRIMARY] : "null");
+            protoLog(ERR, "DRM device {} has no render node, disabling linux dmabuf checks", device->nodes[DRM_NODE_PRIMARY] ? device->nodes[DRM_NODE_PRIMARY] : "null");
             drmFreeDevice(&device);
-            removeGlobal();
         }
     });
 }
+4 −0
Original line number Diff line number Diff line
@@ -75,6 +75,10 @@ stdenv.mkDerivation (finalAttrs: {
    hash = "sha256-deu8zvgseDg2gQEnZiCda4TrbA6pleE9iItoZlsoMtE=";
  };

  # Fixes broken OpenGL applications on Apple silicon (Asahi Linux)
  # Based on commit https://github.com/hyprwm/Hyprland/commit/279ec1c291021479b050c83a0435ac7076c1aee0
  patches = [ ./asahi-fix.patch ];

  postPatch = ''
    # Fix hardcoded paths to /usr installation
    sed -i "s#/usr#$out#" src/render/OpenGL.cpp