Skip to content

Commit

Permalink
buildenv: fix version not being set (#359448)
Browse files Browse the repository at this point in the history
  • Loading branch information
philiptaron authored Nov 26, 2024
2 parents 2e45d37 + e37eead commit 6d0f670
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions pkgs/build-support/buildenv/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -77,17 +77,21 @@ let
(lib.remove null)
];
in runCommand name
rec {
(rec {
inherit manifest ignoreCollisions checkCollisionContents passthru
meta pathsToLink extraPrefix postBuild
nativeBuildInputs buildInputs pname version;
nativeBuildInputs buildInputs;
pkgs = builtins.toJSON chosenOutputs;
extraPathsFrom = lib.optional includeClosures (writeClosure pathsForClosure);
preferLocalBuild = true;
allowSubstitutes = false;
# XXX: The size is somewhat arbitrary
passAsFile = if builtins.stringLength pkgs >= 128*1024 then [ "pkgs" ] else [ ];
}
} // lib.optionalAttrs (pname != null) {
inherit pname;
} // lib.optionalAttrs (version != null) {
inherit version;
})
''
${buildPackages.perl}/bin/perl -w ${builder}
eval "$postBuild"
Expand Down

0 comments on commit 6d0f670

Please sign in to comment.