From 927facd35d76cea61ae8229427de85eb18568fb0 Mon Sep 17 00:00:00 2001
From: Jade Lovelace <lix@jade.fyi>
Date: Fri, 11 Jul 2025 20:02:00 -0700
Subject: [PATCH] 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 ae00b1298353a43a10bbecea8220471731db10ec)
---
 package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/package.nix b/package.nix
index 920f1bf8d..865dbb5ce 100644
--- a/package.nix
+++ b/package.nix
@@ -231,8 +231,6 @@ stdenv.mkDerivation (finalAttrs: {
     );
   };
 
-  VERSION_SUFFIX = versionSuffix;
-
   outputs =
     [ "out" ]
     ++ lib.optionals (!finalAttrs.dontBuild) [
@@ -366,9 +364,9 @@ stdenv.mkDerivation (finalAttrs: {
     lixPythonForBuild
   ];
 
-  # 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";
 
@@ -376,6 +374,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; };