wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-07 14:21:48 +02:00
Code Activity

Fix Meson build

Browse source
This commit is contained in:
Eelco Dolstra 2024-11-04 14:31:52 +01:00
parent f274e8f49d
commit 3fdd7d035d
3 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/libstore/.version-determinate Symbolic link
View file

@ -0,0 +1 @@
../../.version-determinate

2
src/libstore/meson.build
View file

@ -23,7 +23,7 @@ configdata = configuration_data()
# TODO rename, because it will conflict with downstream projects # TODO rename, because it will conflict with downstream projects
configdata.set_quoted('PACKAGE_VERSION', meson.project_version()) 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()) configdata.set_quoted('SYSTEM', host_machine.system())

3
src/libstore/package.nix
View file

@ -38,8 +38,11 @@ mkMesonDerivation (finalAttrs: {
fileset = fileset.unions [ fileset = fileset.unions [
../../build-utils-meson ../../build-utils-meson
./build-utils-meson ./build-utils-meson
# FIXME: get rid of these symlinks.
../../.version ../../.version
./.version ./.version
../../.version-determinate
./.version-determinate
./meson.build ./meson.build
./meson.options ./meson.options
./linux/meson.build ./linux/meson.build