diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-01-25 15:51:56 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-25 15:51:56 +0100 |
| commit | 6eab504d00c7736c06ba735228a95354710e9289 (patch) | |
| tree | a813eca764b5b497958e9dcfd27afef25256d25a /pkgs/top-level | |
| parent | 715f7e1ea027fa108f093651b043b12645afe706 (diff) | |
| parent | 451193a309576f04a173a175a5c147f0b5fb7382 (diff) | |
Merge pull request #212324 from wegank/dolphin-darwin
dolphin-emu-beta: fix build on aarch64 platforms
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dc7c6e5ca6cb1..87fc70d7834a9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2211,8 +2211,13 @@ with pkgs; dolphin-emu = callPackage ../applications/emulators/dolphin-emu { }; dolphin-emu-beta = qt6Packages.callPackage ../applications/emulators/dolphin-emu/master.nix { - inherit (darwin.apple_sdk.frameworks) CoreBluetooth ForceFeedback IOKit OpenGL VideoToolbox; + inherit (darwin.apple_sdk_11_0.frameworks) CoreBluetooth ForceFeedback IOKit OpenGL VideoToolbox; inherit (darwin) moltenvk; + stdenv = + if stdenv.isDarwin && stdenv.isAarch64 then llvmPackages_14.stdenv + # https://github.com/NixOS/nixpkgs/issues/201254 + else if stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU then gcc11Stdenv + else stdenv; }; dolphin-emu-primehack = qt5.callPackage ../applications/emulators/dolphin-emu/primehack.nix { |