b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

nheko: remove -lgcc from NIX_LDFLAGS

Browse source
This commit is contained in:
Weijia Wang 2023-03-04 00:25:33 +02:00
parent 98049c501d
commit f7ac4b4eda
2 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/applications/networking/instant-messengers/nheko/default.nix
View file

@ -83,9 +83,6 @@ stdenv.mkDerivation rec {
"-DCOMPILE_QML=ON" # see https://github.com/Nheko-Reborn/nheko/issues/389
];
# https://github.com/NixOS/nixpkgs/issues/201254
NIX_LDFLAGS = lib.optionalString (stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU) "-lgcc";
preFixup = lib.optionalString voipSupport ''
# add gstreamer plugins path to the wrapper
qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0")

5
pkgs/top-level/all-packages.nix
View file

@ -32171,10 +32171,7 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) AppKit Cocoa Foundation;
};
nheko = libsForQt5.callPackage ../applications/networking/instant-messengers/nheko {
# https://github.com/NixOS/nixpkgs/issues/201254
stdenv = if stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU then gcc12Stdenv else stdenv;
};
nheko = libsForQt5.callPackage ../applications/networking/instant-messengers/nheko { };
nomacs = libsForQt5.callPackage ../applications/graphics/nomacs { };