wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-27 12:41:15 +02:00
Code Activity

More fixes

Browse source
This commit is contained in:
John Ericson 2024-06-27 19:19:32 -04:00
parent 5ba9f6cec6
commit 479befa76d
30 changed files with 101 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/libflake/meson.build
View file

@ -29,9 +29,6 @@ subdir('build-utils-meson/subprojects')
nlohmann_json = dependency('nlohmann_json', version : '>= 3.9')
deps_public += nlohmann_json
libgit2 = dependency('libgit2')
deps_public += libgit2
add_project_arguments(
# TODO(Qyriad): Yes this is how the autoconf+Make system did it.
# It would be nice for our headers to be idempotent instead.

4
src/libflake/package.nix
View file

@ -69,9 +69,11 @@ mkDerivation (finalAttrs: {
];
preConfigure =
# "Inline" .version so its not a symlink, and includes the suffix
# "Inline" .version so it's not a symlink, and includes the suffix.
# Do the meson utils, without modification.
''
echo ${version} > .version
cp -r ${../../build-utils-meson} build-utils-meson
'';
env = lib.optionalAttrs (stdenv.isLinux && !(stdenv.hostPlatform.isStatic && stdenv.system == "aarch64-linux")) {