JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nheko && mtxclient: enable for Darwin but mark as broken

Browse Source
This commit is contained in:
Doron Behar 2020-04-30 10:25:38 +03:00
parent 0577b994af
commit bdcbfc77c9
2 changed files with 8 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/applications/networking/instant-messengers/nheko/default.nix
View File

@ -33,22 +33,6 @@ mkDerivation rec {
sha256 = "12sxibbrn79sxkf9jrm7jrlj7l5vz15claxrrll7pkv9mv44wady"; sha256 = "12sxibbrn79sxkf9jrm7jrlj7l5vz15claxrrll7pkv9mv44wady";
}; };
# If, on Darwin, you encounter the error
# error: must specify at least one argument for '...' parameter of variadic
# macro [-Werror,-Wgnu-zero-variadic-macro-arguments]
# Then adding this parameter is likely the fix you want.
#
# However, it looks like either cmake doesn't honor this CFLAGS variable, or
# darwin's compiler doesn't have the same syntax as gcc for turning off
# -Werror selectively.
#
# Anyway, this is something that will have to be debugged with access to a
# darwin-based OS. Sorry about that!
#
#preConfigure = lib.optionalString stdenv.isDarwin ''
# export CFLAGS=-Wno-error=gnu-zero-variadic-macro-arguments
#'';
nativeBuildInputs = [ nativeBuildInputs = [
lmdbxx lmdbxx
cmake cmake
@ -89,7 +73,10 @@ mkDerivation rec {
description = "Desktop client for the Matrix protocol"; description = "Desktop client for the Matrix protocol";
homepage = "https://github.com/Nheko-Reborn/nheko"; homepage = "https://github.com/Nheko-Reborn/nheko";
maintainers = with maintainers; [ ekleog fpletz ]; maintainers = with maintainers; [ ekleog fpletz ];
platforms = platforms.unix; platforms = platforms.all;
# Should be fixable if a higher clang version is used, see:
# https://github.com/NixOS/nixpkgs/pull/85922#issuecomment-619287177
broken = stdenv.targetPlatform.isDarwin;
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
}; };
} }

9
pkgs/development/libraries/mtxclient/default.nix
View File

@ -52,10 +52,9 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/Nheko-Reborn/mtxclient"; homepage = "https://github.com/Nheko-Reborn/mtxclient";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ fpletz ]; maintainers = with maintainers; [ fpletz ];
platforms = platforms.unix; platforms = platforms.all;
# Should be fixable if a higher clang version is used, see:
# As of 2019-06-30, all of the dependencies are available on macOS but the # https://github.com/NixOS/nixpkgs/pull/85922#issuecomment-619287177
# package itself does not build. broken = stdenv.targetPlatform.isDarwin;
broken = stdenv.isDarwin;
}; };
} }