fix: VERSION_SUFFIX was not getting into meson

It was a regression caused by switching to structured attrs, I think.

Fixes: https://git.lix.systems/lix-project/lix/issues/908
Change-Id: Ia62892919945a1f16a81a2e0bb585595fac46669
(cherry picked from commit ae00b12983)
This commit is contained in:
Jade Lovelace
2025-07-20 21:31:20 +00:00
committed by jade
parent 4015082602
commit 4601564996
+4 -4
View File
@@ -208,8 +208,6 @@ stdenv.mkDerivation (finalAttrs: {
);
};
VERSION_SUFFIX = versionSuffix;
outputs =
[ "out" ]
++ lib.optionals (!finalAttrs.dontBuild) [
@@ -336,9 +334,9 @@ stdenv.mkDerivation (finalAttrs: {
disallowedReferences = [ boost ];
# Needed for Meson to find Boost.
# https://github.com/NixOS/nixpkgs/issues/86131.
env = {
# Needed for Meson to find Boost.
# https://github.com/NixOS/nixpkgs/issues/86131.
BOOST_INCLUDEDIR = "${lib.getDev boost}/include";
BOOST_LIBRARYDIR = "${lib.getLib boost}/lib";
@@ -346,6 +344,8 @@ stdenv.mkDerivation (finalAttrs: {
# Turns out the Nix-generated Cargo dependencies are named the same as they
# would be in a Cargo registry cache.
MESON_PACKAGE_CACHE_DIR = finalAttrs.cargoDeps;
VERSION_SUFFIX = versionSuffix;
};
cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; };