From c0407c30ca849f2a28385be4066c28e3677e8f08 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 22 Jan 2023 09:14:34 +0100 Subject: [PATCH 1/2] mtxclient: fix build on aarch64-linux --- pkgs/development/libraries/mtxclient/default.nix | 3 +++ pkgs/top-level/all-packages.nix | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/mtxclient/default.nix b/pkgs/development/libraries/mtxclient/default.nix index 505e58c1ec37..a3b829a754a8 100644 --- a/pkgs/development/libraries/mtxclient/default.nix +++ b/pkgs/development/libraries/mtxclient/default.nix @@ -53,6 +53,9 @@ stdenv.mkDerivation rec { spdlog ]; + # https://github.com/NixOS/nixpkgs/issues/201254 + NIX_LDFLAGS = lib.optionalString (stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU) "-lgcc"; + meta = with lib; { description = "Client API library for the Matrix protocol."; homepage = "https://github.com/Nheko-Reborn/mtxclient"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 02a7df000c48..dc6083d5c9c0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22021,7 +22021,10 @@ with pkgs; mtpfs = callPackage ../tools/filesystems/mtpfs { }; - mtxclient = callPackage ../development/libraries/mtxclient { }; + mtxclient = callPackage ../development/libraries/mtxclient { + # https://github.com/NixOS/nixpkgs/issues/201254 + stdenv = if stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU then gcc11Stdenv else stdenv; + }; mu = callPackage ../tools/networking/mu { texinfo = texinfo4; From a10858477fb9a384ad8aba8f2ade7488f92f4eeb Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 22 Jan 2023 09:14:42 +0100 Subject: [PATCH 2/2] nheko: fix build on aarch64-linux --- .../networking/instant-messengers/nheko/default.nix | 8 ++++++-- pkgs/top-level/all-packages.nix | 5 ++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix index 680833ca2e6a..e6b3d84c7b79 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 dc6083d5c9c0..454c8d096ea4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31546,7 +31546,10 @@ with pkgs; ngt = callPackage ../development/libraries/ngt { }; - nheko = libsForQt5.callPackage ../applications/networking/instant-messengers/nheko { }; + 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 gcc11Stdenv else stdenv; + }; nomacs = libsForQt5.callPackage ../applications/graphics/nomacs { };