colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dolphin-emu: remove -lgcc from NIX_LDFLAGS

Browse Source
This commit is contained in:
Weijia Wang 2023-03-04 00:24:43 +02:00
parent 8cf8d77121
commit 8f040ec406
2 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/applications/emulators/dolphin-emu/default.nix
View File

@ -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 \

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

@ -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;
}; };