BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

applyPatches: Fix a bug (#283887)

Browse source
This commit is contained in:
Thomas Lepoix 2024-02-29 01:29:48 +01:00 committed by GitHub
parent 8e6598a68c
commit 6aa4ed4487
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -904,14 +904,15 @@ rec {
else throw "applyPatches: please supply a `name` argument because a default name can only be computed when the `src` is a path or is an attribute set with a `name` attribute."
) + "-patched"
, patches ? [ ]
, prePatch ? ""
, postPatch ? ""
, ...
}@args:
if patches == [ ] && postPatch == ""
if patches == [ ] && prePatch == "" && postPatch == ""
then src # nothing to do, so use original src to avoid additional drv
else stdenvNoCC.mkDerivation
{
inherit name src patches postPatch;
({
inherit name src patches prePatch postPatch;
preferLocalBuild = true;
allowSubstitutes = false;
phases = "unpackPhase patchPhase installPhase";
@ -919,7 +920,7 @@ rec {
}
# Carry `meta` information from the underlying `src` if present.
// (optionalAttrs (src?meta) { inherit (src) meta; })
// (removeAttrs args [ "src" "name" "patches" "postPatch" ]);
// (removeAttrs args [ "src" "name" "patches" "prePatch" "postPatch" ]));
/* An immutable file in the store with a length of 0 bytes. */
emptyFile = runCommand "empty-file"