From 45ff01a2d59b04f85871830d6dd31400e07aabd5 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 27 Mar 2025 00:09:20 -0400
Subject: [PATCH] Fix a bunch of missing meson boilerplate

These other libraries need this too

(cherry picked from commit ffdce51cd5bd31c1680d4f28b383837682cb7d41)
---
 src/libcmd/meson.build      | 5 +++++
 src/libexpr/meson.build     | 5 +++++
 src/libfetchers/meson.build | 5 +++++
 src/libflake/meson.build    | 5 +++++
 src/libmain/meson.build     | 5 +++++
 5 files changed, 25 insertions(+)

diff --git a/src/libcmd/meson.build b/src/libcmd/meson.build
index 4145f408a..114c099df 100644
--- a/src/libcmd/meson.build
+++ b/src/libcmd/meson.build
@@ -113,10 +113,15 @@ headers = [config_h] + files(
   'repl.hh',
 )
 
+subdir('nix-meson-build-support/export-all-symbols')
+subdir('nix-meson-build-support/windows-version')
+
 this_library = library(
   'nixcmd',
   sources,
   dependencies : deps_public + deps_private + deps_other,
+  include_directories : include_dirs,
+  link_args: linker_export_flags,
   prelink : true, # For C++ static initializers
   install : true,
 )
diff --git a/src/libexpr/meson.build b/src/libexpr/meson.build
index ec2a44cd1..6553fbff9 100644
--- a/src/libexpr/meson.build
+++ b/src/libexpr/meson.build
@@ -186,6 +186,9 @@ headers = [config_h] + files(
 
 subdir('primops')
 
+subdir('nix-meson-build-support/export-all-symbols')
+subdir('nix-meson-build-support/windows-version')
+
 this_library = library(
   'nixexpr',
   sources,
@@ -193,6 +196,8 @@ this_library = library(
   lexer_tab,
   generated_headers,
   dependencies : deps_public + deps_private + deps_other,
+  include_directories : include_dirs,
+  link_args: linker_export_flags,
   prelink : true, # For C++ static initializers
   install : true,
 )
diff --git a/src/libfetchers/meson.build b/src/libfetchers/meson.build
index 58afbb7d0..84bb14895 100644
--- a/src/libfetchers/meson.build
+++ b/src/libfetchers/meson.build
@@ -76,10 +76,15 @@ headers = files(
   'tarball.hh',
 )
 
+subdir('nix-meson-build-support/export-all-symbols')
+subdir('nix-meson-build-support/windows-version')
+
 this_library = library(
   'nixfetchers',
   sources,
   dependencies : deps_public + deps_private + deps_other,
+  include_directories : include_dirs,
+  link_args: linker_export_flags,
   prelink : true, # For C++ static initializers
   install : true,
 )
diff --git a/src/libflake/meson.build b/src/libflake/meson.build
index b757d0d76..27effe73c 100644
--- a/src/libflake/meson.build
+++ b/src/libflake/meson.build
@@ -58,10 +58,15 @@ headers = files(
   'flake/url-name.hh',
 )
 
+subdir('nix-meson-build-support/export-all-symbols')
+subdir('nix-meson-build-support/windows-version')
+
 this_library = library(
   'nixflake',
   sources,
   dependencies : deps_public + deps_private + deps_other,
+  include_directories : include_dirs,
+  link_args: linker_export_flags,
   prelink : true, # For C++ static initializers
   install : true,
 )
diff --git a/src/libmain/meson.build b/src/libmain/meson.build
index 00f945f49..6a0a22295 100644
--- a/src/libmain/meson.build
+++ b/src/libmain/meson.build
@@ -82,10 +82,15 @@ headers = [config_h] + files(
   'shared.hh',
 )
 
+subdir('nix-meson-build-support/export-all-symbols')
+subdir('nix-meson-build-support/windows-version')
+
 this_library = library(
   'nixmain',
   sources,
   dependencies : deps_public + deps_private + deps_other,
+  include_directories : include_dirs,
+  link_args: linker_export_flags,
   prelink : true, # For C++ static initializers
   install : true,
 )