From 8e3b74171da04dec217866ce89e6c6c453ca23e0 Mon Sep 17 00:00:00 2001 From: waelwindows Date: Sat, 15 Apr 2023 02:15:15 +0300 Subject: [PATCH] cpp-utilities: Add Darwin support --- pkgs/development/libraries/cpp-utilities/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/cpp-utilities/default.nix b/pkgs/development/libraries/cpp-utilities/default.nix index 8fc767530ca..f2681736975 100644 --- a/pkgs/development/libraries/cpp-utilities/default.nix +++ b/pkgs/development/libraries/cpp-utilities/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , cmake , cppunit +, iconv }: stdenv.mkDerivation rec { @@ -18,19 +19,23 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; nativeCheckInputs = [ cppunit ]; + buildInputs = lib.optionals stdenv.isDarwin [ + iconv # needed on Darwin, see https://github.com/Martchus/cpp-utilities/issues/4 + ]; # Otherwise, tests fail since the resulting shared object libc++utilities.so is only available in PWD of the make files preCheck = '' checkFlagsArray+=( "LD_LIBRARY_PATH=$PWD" ) ''; - doCheck = true; + # tests fail on Darwin + doCheck = !stdenv.isDarwin; meta = with lib; { homepage = "https://github.com/Martchus/cpp-utilities"; description = "Common C++ classes and routines used by @Martchus' applications featuring argument parser, IO and conversion utilities"; license = licenses.gpl2Plus; maintainers = with maintainers; [ doronbehar ]; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; }