forked from mirrors/nixpkgs
toybox: small refactor
This commit is contained in:
parent
5e2eff6984
commit
e583172fcb
1 changed files with 8 additions and 4 deletions
|
@ -6,6 +6,10 @@
|
||||||
extraConfig ? ""
|
extraConfig ? ""
|
||||||
}:
|
}:
|
||||||
|
|
||||||
|
let
|
||||||
|
inherit (lib) optionals;
|
||||||
|
in
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "toybox";
|
pname = "toybox";
|
||||||
version = "0.8.8";
|
version = "0.8.8";
|
||||||
|
@ -17,12 +21,12 @@ stdenv.mkDerivation rec {
|
||||||
sha256 = "sha256-T3qE9xlcEoZOcY52XfYPpN34zzQl6mfcRnyuldnIvCk=";
|
sha256 = "sha256-T3qE9xlcEoZOcY52XfYPpN34zzQl6mfcRnyuldnIvCk=";
|
||||||
};
|
};
|
||||||
|
|
||||||
depsBuildBuild = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ buildPackages.stdenv.cc ]; # needed for cross
|
depsBuildBuild = optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ buildPackages.stdenv.cc ];
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
libxcrypt
|
libxcrypt
|
||||||
] ++ lib.optionals stdenv.isDarwin [
|
] ++ optionals stdenv.isDarwin [
|
||||||
libiconv
|
libiconv
|
||||||
] ++lib.optionals (enableStatic && stdenv.cc.libc ? static) [
|
] ++ optionals (enableStatic && stdenv.cc.libc ? static) [
|
||||||
stdenv.cc.libc
|
stdenv.cc.libc
|
||||||
stdenv.cc.libc.static
|
stdenv.cc.libc.static
|
||||||
];
|
];
|
||||||
|
@ -51,7 +55,7 @@ stdenv.mkDerivation rec {
|
||||||
make oldconfig
|
make oldconfig
|
||||||
'';
|
'';
|
||||||
|
|
||||||
makeFlags = [ "PREFIX=$(out)/bin" ] ++ lib.optional enableStatic "LDFLAGS=--static";
|
makeFlags = [ "PREFIX=$(out)/bin" ] ++ optionals enableStatic [ "LDFLAGS=--static" ];
|
||||||
|
|
||||||
installTargets = [ "install_flat" ];
|
installTargets = [ "install_flat" ];
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue