diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-01-23 23:52:31 +0100 |
|---|---|---|
| committer | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-01-23 23:52:31 +0100 |
| commit | 451193a309576f04a173a175a5c147f0b5fb7382 (patch) | |
| tree | 8af9da0e1cfd159a97f209c78b45244865c1803e | |
| parent | 1a711794d55423e02792005fc7daa5b5e072699f (diff) | |
dolphin-emu-beta: fix build on aarch64 platforms
| -rw-r--r-- | pkgs/applications/emulators/dolphin-emu/master.nix | 5 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 7 |
2 files changed, 11 insertions, 1 deletions
diff --git a/pkgs/applications/emulators/dolphin-emu/master.nix b/pkgs/applications/emulators/dolphin-emu/master.nix index 83da181f24b4..7f68b5821495 100644 --- a/pkgs/applications/emulators/dolphin-emu/master.nix +++ b/pkgs/applications/emulators/dolphin-emu/master.nix @@ -141,6 +141,9 @@ stdenv.mkDerivation rec { "--set QT_XCB_NO_XI2 1" ]; + # https://github.com/NixOS/nixpkgs/issues/201254 + NIX_LDFLAGS = lib.optionalString (stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU) "-lgcc"; + # Use nix-provided libraries instead of submodules postPatch = lib.optionalString stdenv.isDarwin '' substituteInPlace CMakeLists.txt \ @@ -187,5 +190,7 @@ stdenv.mkDerivation rec { xfix ivar ]; + # Requires both LLVM and SDK bump + broken = stdenv.isDarwin && stdenv.isx86_64; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2d7229e7d07b..6cd46c486ba1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2206,8 +2206,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 { |