diff options
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/nheko/default.nix | 23 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 22 insertions, 3 deletions
diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix index 4d002a4a7531..d3c0a6f8eca2 100644 --- a/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -1,4 +1,7 @@ -{ stdenv, fetchFromGitHub, fetchurl, cmake, doxygen, lmdb, qt5 }: +{ + lib, stdenv, fetchFromGitHub, fetchurl, + cmake, doxygen, lmdb, qt5, qtmacextras +}: let json_hpp = fetchurl { @@ -60,6 +63,22 @@ stdenv.mkDerivation rec { # a dependency is updated, so that the fetches up there can be updated too patches = [ ./external-deps.patch ]; + # 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 + #''; + cmakeFlags = [ "-DMATRIX_STRUCTS_LIBRARY=${matrix-structs}/lib/static/libmatrix_structs.a" "-DMATRIX_STRUCTS_INCLUDE_DIR=${matrix-structs}/include/matrix_structs" @@ -71,7 +90,7 @@ stdenv.mkDerivation rec { buildInputs = [ lmdb lmdbxx matrix-structs qt5.qtbase qt5.qtmultimedia qt5.qttools tweeny - ]; + ] ++ lib.optional stdenv.isDarwin qtmacextras; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c19e956e7a76..4287bf5afeef 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17247,7 +17247,7 @@ with pkgs; nedit = callPackage ../applications/editors/nedit { }; - nheko = callPackage ../applications/networking/instant-messengers/nheko { }; + nheko = libsForQt5.callPackage ../applications/networking/instant-messengers/nheko { }; nomacs = libsForQt5.callPackage ../applications/graphics/nomacs { }; |