Compare commits

...

1 Commits

Author SHA1 Message Date
c4583f787d Fix Nanos6 build from git
The src.rev attribute is not available as it comes from source before
the recursive operator. Instead, simply get it from the function inputs.

Cc: Aleix Boné <aleix.boneribo@bsc.es>
Reviewed-by: Aleix Roca Nonell <aleix.rocanonell@bsc.es>
2025-02-28 13:36:00 +01:00

View File

@ -48,7 +48,7 @@ let
source = if (useGit) then git else release; source = if (useGit) then git else release;
in in
stdenv.mkDerivation (source // rec { stdenv.mkDerivation (source // {
pname = "nanos6"; pname = "nanos6";
prePatch = '' prePatch = ''
@ -62,7 +62,7 @@ in
export CACHELINE_WIDTH=${toString cachelineBytes} export CACHELINE_WIDTH=${toString cachelineBytes}
./autogen.sh ./autogen.sh
'' + lib.optionalString (useGit) '' '' + lib.optionalString (useGit) ''
export NANOS6_GIT_VERSION=${src.rev} export NANOS6_GIT_VERSION=${gitCommit}
export NANOS6_GIT_BRANCH=${gitBranch} export NANOS6_GIT_BRANCH=${gitBranch}
''; '';