nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-22 02:09:36 +01:00
Code Activity

Merge remote-tracking branch 'origin/2.26-maintenance' into detsys-main

Browse source
This commit is contained in:
Eelco Dolstra 2025-02-24 22:41:22 +01:00
commit 6749d26dbb
59 changed files with 708 additions and 403 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/libutil/package.nix
View file

@ -52,17 +52,6 @@ mkMesonLibrary (finalAttrs: {
nlohmann_json
];
preConfigure =
# "Inline" .version so it's not a symlink, and includes the suffix.
# Do the meson utils, without modification.
#
# TODO: change release process to add `pre` in `.version`, remove it
# before tagging, and restore after.
''
chmod u+w ./.version
echo ${version} > ../../.version
'';
mesonFlags = [
(lib.mesonEnable "cpuid" stdenv.hostPlatform.isx86_64)
];