movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-12 04:35:41 +03:00
Code Issues Projects Releases Packages Wiki Activity

applyPatches: simplify src attribute inheritance (#409614)

Browse source
This commit is contained in:
Philip Taron 2025-05-21 20:53:02 -07:00 • committed by GitHub
commit a16efe5d2f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

18
pkgs/build-support/trivial-builders/default.nix
View file

@ -1022,6 +1022,12 @@ rec {
postPatch ? "",
...
}@args:
assert lib.assertMsg (
!args ? meta
) "applyPatches will not merge 'meta', change it in 'src' instead";
assert lib.assertMsg (
!args ? passthru
) "applyPatches will not merge 'passthru', change it in 'src' instead";
if patches == [ ] && prePatch == "" && postPatch == "" then
src # nothing to do, so use original src to avoid additional drv
else
@ -1051,19 +1057,17 @@ rec {
phases = "unpackPhase patchPhase installPhase";
installPhase = "cp -R ./ $out";
}
# Carry and merge information from the underlying `src` if present.
// (optionalAttrs (src ? meta || args ? meta) {
meta = src.meta or { } // args.meta or { };
# Carry (and merge) information from the underlying `src` if present.
// (optionalAttrs (src ? meta) {
inherit (src) meta;
})
// (optionalAttrs (extraPassthru != { } || src ? passthru || args ? passthru) {
passthru = extraPassthru // src.passthru or { } // args.passthru or { };
// (optionalAttrs (extraPassthru != { } || src ? passthru) {
passthru = extraPassthru // src.passthru or { };
})
# Forward any additional arguments to the derviation
// (removeAttrs args [
"src"
"name"
"meta"
"passthru"
"patches"
"prePatch"
"postPatch"