diff --git a/.github/scripts/build_projects.py b/.github/scripts/build_projects.py
index ea4fdff..fb34a87 100755
--- a/.github/scripts/build_projects.py
+++ b/.github/scripts/build_projects.py
@@ -20,16 +20,16 @@ if (PLATFORM_TARGET.startswith("android_")
 elif PLATFORM_TARGET.startswith("native_"):
     if OS_NAME == "osx":
         if PLATFORM_TARGET == "native_mixed":
-            TARGETS = ("libzim", )
+            TARGETS = ("libzim", "libkiwix")
         else:
-            TARGETS = ("libzim", "zim-tools", "libkiwix")
+            TARGETS = ("zim-tools", )
     else:
         if DESKTOP:
             TARGETS = ("kiwix-desktop",)
         elif PLATFORM_TARGET == "native_mixed":
-            TARGETS = ("libzim",)
+            TARGETS = ("libzim", "libkiwix")
         else:
-            TARGETS = ("zim-tools", "libkiwix", "kiwix-tools")
+            TARGETS = ("zim-tools", "kiwix-tools")
 elif PLATFORM_TARGET in ("win32_static", "armhf_static", "armhf_dyn", "i586_static"):
     TARGETS = ("kiwix-tools",)
 elif PLATFORM_TARGET == "flatpak":
diff --git a/.github/scripts/build_release_nightly.py b/.github/scripts/build_release_nightly.py
index 407efe9..772d7e6 100755
--- a/.github/scripts/build_release_nightly.py
+++ b/.github/scripts/build_release_nightly.py
@@ -26,14 +26,17 @@ if PLATFORM_TARGET.startswith("android_") or PLATFORM_TARGET.startswith("iOS"):
     TARGETS = ("libzim", "libkiwix")
 elif PLATFORM_TARGET.startswith("native_"):
     if OS_NAME == "osx":
-        TARGETS = ("libzim", ) if PLATFORM_TARGET == "native_mixed" else ("libzim", "zim-tools", "libkiwix")
+        if PLATFORM_TARGET == "native_mixed":
+            TARGETS = ("libzim", "libkiwix")
+        else:
+            TARGETS = ("zim-tools", )
     else:
         if DESKTOP:
             TARGETS = ("kiwix-desktop",)
         elif PLATFORM_TARGET == "native_mixed":
-            TARGETS = ("libzim",)
+            TARGETS = ("libzim", "libkiwix")
         else:
-            TARGETS = ("zim-tools", "libkiwix", "kiwix-tools")
+            TARGETS = ("zim-tools", "kiwix-tools")
 elif PLATFORM_TARGET in ("win32_static", "armhf_static", "i586_static"):
     TARGETS = ("kiwix-tools",)
 elif PLATFORM_TARGET == "flatpak":
diff --git a/kiwixbuild/dependencies/libkiwix.py b/kiwixbuild/dependencies/libkiwix.py
index c94567c..6ccfd0c 100644
--- a/kiwixbuild/dependencies/libkiwix.py
+++ b/kiwixbuild/dependencies/libkiwix.py
@@ -28,6 +28,8 @@ class Libkiwix(Dependency):
                 return '-Db_bitcode=true'
             if platformInfo.name == 'flatpak':
                 return '--wrap-mode=nodownload'
+            if platformInfo.name == 'native_mixed' and option('target') == 'libkiwix':
+                return "-Dstatic-linkage=true"
             return ''
 
         @property
diff --git a/kiwixbuild/platforms/native.py b/kiwixbuild/platforms/native.py
index 1a0c2c6..4ff2738 100644
--- a/kiwixbuild/platforms/native.py
+++ b/kiwixbuild/platforms/native.py
@@ -52,10 +52,5 @@ class NativeMixed(NativePlatformInfo):
         env['PATH'] = ':'.join([pj(static_install_dir, 'bin')] + [env['PATH']])
         pkgconfig_path = pj(static_install_dir, static_buildEnv.libprefix, 'pkgconfig')
         env['PKG_CONFIG_PATH'] = ':'.join([env['PKG_CONFIG_PATH'], pkgconfig_path])
-        return env
-
-    def set_comp_flags(self, env):
-        super().set_comp_flags(env)
-        static_platform = self.get_platform('native_static')
-        static_install_dir = static_platform.buildEnv.install_dir
         env['CPPFLAGS'] = " ".join(['-I'+pj(static_install_dir, 'include'), env['CPPFLAGS']])
+        return env