gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

toybox: small refactor

Browse Source
This commit is contained in:
Atemu
2023-01-16 12:17:04 +01:00
parent 5e2eff6984
commit e583172fcb
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/misc/toybox/default.nix
+8 -4
View File
@@ -6,6 +6,10 @@
extraConfig ? ""
}:
let
inherit (lib) optionals;
in
stdenv.mkDerivation rec {
pname = "toybox";
version = "0.8.8";
@@ -17,12 +21,12 @@ stdenv.mkDerivation rec {
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 = [
libxcrypt
] ++ lib.optionals stdenv.isDarwin [
] ++ optionals stdenv.isDarwin [
libiconv
] ++lib.optionals (enableStatic && stdenv.cc.libc ? static) [
] ++ optionals (enableStatic && stdenv.cc.libc ? static) [
stdenv.cc.libc
stdenv.cc.libc.static
];
@@ -51,7 +55,7 @@ stdenv.mkDerivation rec {
make oldconfig
'';
makeFlags = [ "PREFIX=$(out)/bin" ] ++ lib.optional enableStatic "LDFLAGS=--static";
makeFlags = [ "PREFIX=$(out)/bin" ] ++ optionals enableStatic [ "LDFLAGS=--static" ];
installTargets = [ "install_flat" ];