From 1b7cfd35018e7ae733859e038f03cb233fd5f1ae Mon Sep 17 00:00:00 2001 From: Anton Sviridov Date: Sun, 19 Nov 2023 10:31:20 +0000 Subject: [PATCH] Fix --- .github/workflows/ci.yml | 2 +- build.sbt | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6db417d..c213ceb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -62,7 +62,7 @@ jobs: PLATFORM="$(uname)" if [ $PLATFORM == "Darwin" ]; then - echo "It's a Mac" + python3 -m pip install packaging else docker run -p 5432:5432 -e POSTGRES_PASSWORD=mysecretpassword -d postgres docker run -e MYSQL_ROOT_PASSWORD=my-secret-pw -e MYSQL_USER=mysql -e MYSQL_PASSWORD=mysql-password -e MYSQL_DATABASE=mysql_db -p 3306:3306 -d mysql diff --git a/build.sbt b/build.sbt index 6e9b95a..eaeb670 100644 --- a/build.sbt +++ b/build.sbt @@ -170,9 +170,10 @@ lazy val mysql = nativeConfig := { val config = nativeConfig.value - config.withLinkingOptions(config.linkingOptions.map { - case "-lresolv-lresolv" => "-lresolv" - case other => other + config.withLinkingOptions(config.linkingOptions.flatMap { + case "-lresolv-lresolv" => Some("-lresolv") + case "-lm-lresolv" => None + case other => Some(other) }) },