From 247ec94041baf5d959ce9b08897819ad4ee85d8a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 21 Feb 2025 19:19:02 +0100 Subject: [PATCH] Remove unnecessary ./.version-determinate symlink --- src/libstore/.version-determinate | 1 - src/libstore/meson.build | 2 +- src/libstore/package.nix | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) delete mode 120000 src/libstore/.version-determinate diff --git a/src/libstore/.version-determinate b/src/libstore/.version-determinate deleted file mode 120000 index c4121e0c3..000000000 --- a/src/libstore/.version-determinate +++ /dev/null @@ -1 +0,0 @@ -../../.version-determinate \ No newline at end of file diff --git a/src/libstore/meson.build b/src/libstore/meson.build index aaaa5956d..85192c299 100644 --- a/src/libstore/meson.build +++ b/src/libstore/meson.build @@ -22,7 +22,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').strip()) +configdata.set_quoted('DETERMINATE_NIX_VERSION', fs.read('../../.version-determinate').strip()) configdata.set_quoted('SYSTEM', host_machine.cpu_family() + '-' + host_machine.system()) diff --git a/src/libstore/package.nix b/src/libstore/package.nix index fc68f100b..543694438 100644 --- a/src/libstore/package.nix +++ b/src/libstore/package.nix @@ -39,7 +39,6 @@ mkMesonLibrary (finalAttrs: { ../../.version ./.version ../../.version-determinate - ./.version-determinate ./meson.build ./meson.options ./linux/meson.build