summary refs log tree commit diff
diff options
context:
space:
mode:
authorWeijia Wang <9713184+wegank@users.noreply.github.com>2023-10-31 21:17:08 +0100
committerWeijia Wang <9713184+wegank@users.noreply.github.com>2023-10-31 21:17:08 +0100
commitf0a33c775e238a30b75d2152ba641837efb642e2 (patch)
treeb48a36d4cc4bb1522dad4aeff3a04bfad06da63b
parent4c838ddf1475e374bb34f17c0456fdffec5c2854 (diff)
downloadnixpkgs-f0a33c775e238a30b75d2152ba641837efb642e2.tar
nixpkgs-f0a33c775e238a30b75d2152ba641837efb642e2.tar.gz
nixpkgs-f0a33c775e238a30b75d2152ba641837efb642e2.tar.bz2
nixpkgs-f0a33c775e238a30b75d2152ba641837efb642e2.tar.lz
nixpkgs-f0a33c775e238a30b75d2152ba641837efb642e2.tar.xz
nixpkgs-f0a33c775e238a30b75d2152ba641837efb642e2.tar.zst
nixpkgs-f0a33c775e238a30b75d2152ba641837efb642e2.zip
qt5.qtmultimedia: fix build with clang 16
-rw-r--r--pkgs/development/libraries/qt-5/5.15/default.nix8
1 files changed, 8 insertions, 0 deletions
diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix
index b09c7af54a5..bf2663fdaae 100644
--- a/pkgs/development/libraries/qt-5/5.15/default.nix
+++ b/pkgs/development/libraries/qt-5/5.15/default.nix
@@ -52,6 +52,14 @@ let
       # prevent headaches from stale qmlcache data
       ./qtdeclarative-default-disable-qmlcache.patch
     ];
+    qtmultimedia = lib.optionals stdenv.isDarwin [
+      # build patch for qtmultimedia with xcode 15
+      (fetchpatch {
+        url = "https://raw.githubusercontent.com/Homebrew/formula-patches/3f509180/qt5/qt5-qtmultimedia-xcode15.patch";
+        stripLen = 1;
+        hash = "sha256-HrEqfmm8WbapWgLM0L4AKW8168pwT2zYI8HOJruEPSs=";
+      })
+    ];
     qtpim = [
       ## Upstream patches after the Qt6 transition that apply without problems & fix bugs