dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #212324 from wegank/dolphin-darwin

Browse Source 
dolphin-emu-beta: fix build on aarch64 platforms
This commit is contained in:
Weijia Wang 2023-01-25 15:51:56 +01:00 committed by GitHub
commit 6eab504d00
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/applications/emulators/dolphin-emu/master.nix
View File

@ -141,6 +141,9 @@ stdenv.mkDerivation rec {
"--set QT_XCB_NO_XI2 1" "--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 # Use nix-provided libraries instead of submodules
postPatch = lib.optionalString stdenv.isDarwin '' postPatch = lib.optionalString stdenv.isDarwin ''
substituteInPlace CMakeLists.txt \ substituteInPlace CMakeLists.txt \
@ -187,5 +190,7 @@ stdenv.mkDerivation rec {
xfix xfix
ivar ivar
]; ];
# Requires both LLVM and SDK bump
broken = stdenv.isDarwin && stdenv.isx86_64;
}; };
} }

7
pkgs/top-level/all-packages.nix
View File

@ -2211,8 +2211,13 @@ with pkgs;
dolphin-emu = callPackage ../applications/emulators/dolphin-emu { }; dolphin-emu = callPackage ../applications/emulators/dolphin-emu { };
dolphin-emu-beta = qt6Packages.callPackage ../applications/emulators/dolphin-emu/master.nix { 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; 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 { dolphin-emu-primehack = qt5.callPackage ../applications/emulators/dolphin-emu/primehack.nix {