guiwf/lix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: VERSION_SUFFIX was not getting into meson

Browse Source 
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 20:21:28 +00:00
committed by jade
parent ba5b1cd1cc
commit 927facd35d
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package.nix
+3 -3
View File
@@ -231,8 +231,6 @@ stdenv.mkDerivation (finalAttrs: {
); );
}; };
VERSION_SUFFIX = versionSuffix;
outputs = outputs =
[ "out" ] [ "out" ]
++ lib.optionals (!finalAttrs.dontBuild) [ ++ lib.optionals (!finalAttrs.dontBuild) [
@@ -366,9 +364,9 @@ stdenv.mkDerivation (finalAttrs: {
lixPythonForBuild lixPythonForBuild
]; ];
env = {
# Needed for Meson to find Boost. # Needed for Meson to find Boost.
# https://github.com/NixOS/nixpkgs/issues/86131. # https://github.com/NixOS/nixpkgs/issues/86131.
env = {
BOOST_INCLUDEDIR = "${lib.getDev boost}/include"; BOOST_INCLUDEDIR = "${lib.getDev boost}/include";
BOOST_LIBRARYDIR = "${lib.getLib boost}/lib"; 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 # Turns out the Nix-generated Cargo dependencies are named the same as they
# would be in a Cargo registry cache. # would be in a Cargo registry cache.
MESON_PACKAGE_CACHE_DIR = finalAttrs.cargoDeps; MESON_PACKAGE_CACHE_DIR = finalAttrs.cargoDeps;
VERSION_SUFFIX = versionSuffix;
}; };
cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; }; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; };