mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-06-05 21:03:40 +00:00
stdenv.mkDerivation: store default builder args in global scope
This commit is contained in:
@@ -213,6 +213,12 @@ let
|
||||
"outputChecks"
|
||||
];
|
||||
|
||||
defaultBuilderArgs = [
|
||||
"-e"
|
||||
./source-stdenv.sh
|
||||
./default-builder.sh
|
||||
];
|
||||
|
||||
inherit (stdenv)
|
||||
hostPlatform
|
||||
buildPlatform
|
||||
@@ -635,11 +641,16 @@ let
|
||||
|
||||
builder = attrs.realBuilder or stdenvShell;
|
||||
args =
|
||||
attrs.args or [
|
||||
"-e"
|
||||
./source-stdenv.sh
|
||||
(attrs.builder or ./default-builder.sh)
|
||||
];
|
||||
attrs.args or (
|
||||
if attrs ? builder then
|
||||
[
|
||||
"-e"
|
||||
./source-stdenv.sh
|
||||
attrs.builder
|
||||
]
|
||||
else
|
||||
defaultBuilderArgs
|
||||
);
|
||||
inherit stdenv;
|
||||
|
||||
# The `system` attribute of a derivation has special meaning to Nix.
|
||||
|
||||
Reference in New Issue
Block a user