toybox: use structuredAttrs instead of passAsFile (#502706)
This commit is contained in:
@@ -22,8 +22,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
src = fetchFromGitHub {
|
||||
owner = "landley";
|
||||
repo = "toybox";
|
||||
rev = finalAttrs.version;
|
||||
sha256 = "sha256-b5sigIxyg4T4wVc5z8Das+RdEXmNBPFsXpWwXxU/ERE=";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-b5sigIxyg4T4wVc5z8Das+RdEXmNBPFsXpWwXxU/ERE=";
|
||||
};
|
||||
|
||||
depsBuildBuild = optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
|
||||
@@ -43,7 +43,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
postPatch = "patchShebangs .";
|
||||
|
||||
inherit extraConfig;
|
||||
passAsFile = [ "extraConfig" ];
|
||||
|
||||
configurePhase = ''
|
||||
make ${
|
||||
@@ -57,7 +56,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"defconfig"
|
||||
}
|
||||
|
||||
cat $extraConfigPath .config > .config-
|
||||
printf "%s" "$extraConfig" > .config-
|
||||
cat .config >> .config-
|
||||
mv .config- .config
|
||||
|
||||
make oldconfig
|
||||
@@ -87,6 +87,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = "-Wno-error";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
meta = {
|
||||
description = "Lightweight implementation of some Unix command line utilities";
|
||||
homepage = "https://landley.net/toybox/";
|
||||
|
||||
Reference in New Issue
Block a user