Merge #263423: cairo: fix cross

...into staging-next
2023-11-01 22:00:42 +01:00
parent cd7af6170b 729fb27ee8
commit 0fdbdec8b4
1 changed files with 12 additions and 12 deletions
@@ -60,18 +60,18 @@ in {
    (lib.mesonEnable "tests" finalAttrs.doCheck)
    (lib.mesonEnable "xlib" x11Support)
    (lib.mesonEnable "xcb" xcbSupport)
-  # ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
-  #   "--cross-file=${builtins.toFile "cross-file.conf" ''
-  #     [properties]
-  #     ipc_rmid_deferred_release = ${
-  #       {
-  #         linux = "true";
-  #         freebsd = "true";
-  #         netbsd = "false";
-  #       }.${stdenv.hostPlatform.parsed.kernel.name} or
-  #         throw "Unknown value for ipc_rmid_deferred_release"
-  #     }
-  #   ''}"
+  ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
+    "--cross-file=${builtins.toFile "cross-file.conf" ''
+      [properties]
+      ipc_rmid_deferred_release = ${
+        {
+          linux = "true";
+          freebsd = "true";
+          netbsd = "false";
+        }.${stdenv.hostPlatform.parsed.kernel.name} or
+          (throw "Unknown value for ipc_rmid_deferred_release")
+      }
+    ''}"
  ];

  preConfigure = ''