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"
|
"--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
|
# Use nix-provided libraries instead of submodules
|
||||||
postPatch = lib.optionalString stdenv.isDarwin ''
|
postPatch = lib.optionalString stdenv.isDarwin ''
|
||||||
substituteInPlace CMakeLists.txt \
|
substituteInPlace CMakeLists.txt \
|
||||||
|
|
|
@ -2320,8 +2320,6 @@ with pkgs;
|
||||||
inherit (darwin) moltenvk;
|
inherit (darwin) moltenvk;
|
||||||
stdenv =
|
stdenv =
|
||||||
if stdenv.isDarwin && stdenv.isAarch64 then llvmPackages_14.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;
|
else stdenv;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue