From 3fdd7d035d5c8e86198fdb08193c5e6833660976 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 4 Nov 2024 14:31:52 +0100 Subject: [PATCH] Fix Meson build --- src/libstore/.version-determinate | 1 + src/libstore/meson.build | 2 +- src/libstore/package.nix | 3 +++ 3 files changed, 5 insertions(+), 1 deletion(-) create mode 120000 src/libstore/.version-determinate diff --git a/src/libstore/.version-determinate b/src/libstore/.version-determinate new file mode 120000 index 000000000..c4121e0c3 --- /dev/null +++ b/src/libstore/.version-determinate @@ -0,0 +1 @@ +../../.version-determinate \ No newline at end of file diff --git a/src/libstore/meson.build b/src/libstore/meson.build index 2670dfcde..41bbb438d 100644 --- a/src/libstore/meson.build +++ b/src/libstore/meson.build @@ -23,7 +23,7 @@ configdata = configuration_data() # TODO rename, because it will conflict with downstream projects configdata.set_quoted('PACKAGE_VERSION', meson.project_version()) -configdata.set_quoted('DETERMINATE_NIX_VERSION', fs.read('./.version-determinate')) +configdata.set_quoted('DETERMINATE_NIX_VERSION', fs.read('.version-determinate').strip()) configdata.set_quoted('SYSTEM', host_machine.system()) diff --git a/src/libstore/package.nix b/src/libstore/package.nix index d98bac16d..f1c880e24 100644 --- a/src/libstore/package.nix +++ b/src/libstore/package.nix @@ -38,8 +38,11 @@ mkMesonDerivation (finalAttrs: { fileset = fileset.unions [ ../../build-utils-meson ./build-utils-meson + # FIXME: get rid of these symlinks. ../../.version ./.version + ../../.version-determinate + ./.version-determinate ./meson.build ./meson.options ./linux/meson.build