From 08b6bd9b5e85b57612d8859ccbeebe23903a3609 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 22 Jan 2023 08:05:07 +0100 Subject: [PATCH] nheko: fix build on aarch64-linux --- .../networking/instant-messengers/nheko/default.nix | 8 ++++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix index 680833ca2e6a8b7..e6b3d84c7b79d71 100644 --- a/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -1,6 +1,5 @@ { lib , stdenv -, mkDerivation , fetchFromGitHub , cmake , asciidoc @@ -26,12 +25,13 @@ , qttools , re2 , spdlog +, wrapQtAppsHook , voipSupport ? true , gst_all_1 , libnice }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "nheko"; version = "0.11.1"; @@ -47,6 +47,7 @@ mkDerivation rec { cmake lmdbxx pkg-config + wrapQtAppsHook ]; buildInputs = [ @@ -82,6 +83,9 @@ 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") diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dd962540c948f50..3b98a8dc9df7d61 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31545,7 +31545,9 @@ with pkgs; ngt = callPackage ../development/libraries/ngt { }; - nheko = libsForQt5.callPackage ../applications/networking/instant-messengers/nheko { }; + nheko = libsForQt5.callPackage ../applications/networking/instant-messengers/nheko { + stdenv = if stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU then gcc11Stdenv else stdenv; + }; nomacs = libsForQt5.callPackage ../applications/graphics/nomacs { };