summary refs log tree commit diff
diff options
context:
space:
mode:
authorWeijia Wang <9713184+wegank@users.noreply.github.com>2023-01-22 09:14:34 +0100
committerWeijia Wang <9713184+wegank@users.noreply.github.com>2023-01-22 09:14:34 +0100
commitc0407c30ca849f2a28385be4066c28e3677e8f08 (patch)
treedffa9ca9928432862bd099346f8f46566be184d8
parentda778757da771caf7dc444e478497c6c14a4a3d0 (diff)
downloadnixpkgs-c0407c30ca849f2a28385be4066c28e3677e8f08.tar
nixpkgs-c0407c30ca849f2a28385be4066c28e3677e8f08.tar.gz
nixpkgs-c0407c30ca849f2a28385be4066c28e3677e8f08.tar.bz2
nixpkgs-c0407c30ca849f2a28385be4066c28e3677e8f08.tar.lz
nixpkgs-c0407c30ca849f2a28385be4066c28e3677e8f08.tar.xz
nixpkgs-c0407c30ca849f2a28385be4066c28e3677e8f08.tar.zst
nixpkgs-c0407c30ca849f2a28385be4066c28e3677e8f08.zip
mtxclient: fix build on aarch64-linux
-rw-r--r--pkgs/development/libraries/mtxclient/default.nix3
-rw-r--r--pkgs/top-level/all-packages.nix5
2 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/development/libraries/mtxclient/default.nix b/pkgs/development/libraries/mtxclient/default.nix
index 505e58c1ec3..a3b829a754a 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 02a7df000c4..dc6083d5c9c 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;