From 9231527e6b8dfa047a3ab9a5c3a11f10c656fe0c Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Thu, 15 Jun 2023 19:19:40 +0200 Subject: [PATCH] qdjango: Potential test fix for Darwin --- pkgs/development/libraries/qdjango/default.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/development/libraries/qdjango/default.nix b/pkgs/development/libraries/qdjango/default.nix index 5793a62969b..8036373a826 100644 --- a/pkgs/development/libraries/qdjango/default.nix +++ b/pkgs/development/libraries/qdjango/default.nix @@ -23,6 +23,11 @@ stdenv.mkDerivation (finalAttrs: { # HTML docs depend on regular docs substituteInPlace qdjango.pro \ --replace 'dist.depends = docs' 'htmldocs.depends = docs' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' + # tst_Auth:constIterator (tests/db/auth/tst_auth.cpp:624) fails on Darwin? + # QVERIFY(&*(it += 2) == 0) evals to false + substituteInPlace tests/db/db.pro \ + --replace 'auth' "" ''; qmakeFlags = [ @@ -44,6 +49,14 @@ stdenv.mkDerivation (finalAttrs: { doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + preCheck = lib.optionalString stdenv.hostPlatform.isDarwin '' + # at this point in the build, install_name for dylibs hasn't been patched yet so we need to set the library path. + # for some reason, this doesn't work when just exporting the needed paths even though the autogenerated wrappers + # should at most prepend paths? just patch them into the wrappers instead + substituteInPlace $(find tests -name target_wrapper.sh) \ + --replace 'DYLD_LIBRARY_PATH=' "DYLD_LIBRARY_PATH=$PWD/src/db:$PWD/src/http:" + ''; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; meta = with lib; {