colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

make-sandboxed: fix to preserve the specified output, for packages like dig

Browse Source
This commit is contained in:
Colin
2024-08-21 04:00:45 +00:00
parent 2758b0eae2
commit b4b95be588
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
modules/programs/make-sandboxed.nix
View File

@@ -500,12 +500,16 @@ let
''; '';
}; };
packageWrapped = sandboxedBy."${wrapperType}"; packageWrapped = sandboxedBy."${wrapperType}";
in packageWithMeta = fixupMetaAndPassthru pkgName packageWrapped (passthru // {
fixupMetaAndPassthru pkgName packageWrapped (passthru // {
# allow the user to build this package, but sandboxed in a different manner. # allow the user to build this package, but sandboxed in a different manner.
# e.g. `<pkg>.sandboxedBy.inplace`. # e.g. `<pkg>.sandboxedBy.inplace`.
# e.g. `<pkg>.sandboxedBy.wrappedDerivation.sandboxedNonBin` # e.g. `<pkg>.sandboxedBy.wrappedDerivation.sandboxedNonBin`
inherit sandboxedBy; inherit sandboxedBy;
}) });
in if package.outputSpecified or false then
# packages like `dig` are actually aliases to `bind.dnsutils`, so preserve that
packageWithMeta."${package.outputName}"
else
packageWithMeta
; ;
in make-sandboxed in make-sandboxed