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

Merge pull request #212051 from wegank/nheko-aarch64-linux

Browse source 
mtxclient, nheko: fix build on aarch64-linux
This commit is contained in:
Jörg Thalheim 2023-01-22 11:37:17 +00:00 committed by GitHub
parent a79892bb87 a10858477f
commit 93915d2f95
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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")

3
pkgs/development/libraries/mtxclient/default.nix
View file

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

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

@ -22027,7 +22027,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;
@ -31549,7 +31552,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 { };