mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-19 19:34:06 +00:00
dolphin-emu: remove -lgcc from NIX_LDFLAGS
This commit is contained in:
parent
8cf8d77121
commit
8f040ec406
@ -135,9 +135,6 @@ stdenv.mkDerivation rec {
|
||||
"--set QT_QPA_PLATFORM xcb"
|
||||
];
|
||||
|
||||
# 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 \
|
||||
|
@ -2320,8 +2320,6 @@ with pkgs;
|
||||
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 gcc12Stdenv
|
||||
else stdenv;
|
||||
};
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user