uutils-coreutils: 0.7.0 -> 0.8.0 (#507379)
This commit is contained in:
@@ -21,13 +21,13 @@ assert selinuxSupport -> lib.meta.availableOn stdenv.hostPlatform libselinux;
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "uutils-coreutils";
|
||||
version = "0.7.0";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "uutils";
|
||||
repo = "coreutils";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-mS1KjnMUQzRqsmy1GCLDlDh2kOSfPhc59RnR9abqtu4=";
|
||||
hash = "sha256-nH0WtsVP1uwPvimpGnmWx5v0VButIFJu9K5wXsiC4cA=";
|
||||
};
|
||||
|
||||
# error: linker `aarch64-linux-gnu-gcc` not found
|
||||
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) pname src version;
|
||||
hash = "sha256-jNFZEafyW0DGpG0tPiI3lzANBiAXYxoOnTsKoGjeOK0=";
|
||||
hash = "sha256-FMTzMgXcAg9dk7dfYG7lTOHYJxN3YHjf0R96LS7W3FI=";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
@@ -77,14 +77,18 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
}"
|
||||
"SKIP_UTILS=${lib.optionalString stdenv.hostPlatform.isStatic "stdbuf"}"
|
||||
]
|
||||
++ lib.optionals (prefix != null) [ "PROG_PREFIX=${prefix}" ]
|
||||
++ lib.optionals buildMulticallBinary [ "MULTICALL=y" ];
|
||||
++ lib.optionals (prefix != null) [
|
||||
"PROG_PREFIX=${prefix}"
|
||||
]
|
||||
++ lib.optionals buildMulticallBinary [
|
||||
"MULTICALL=y"
|
||||
];
|
||||
|
||||
env = {
|
||||
CARGO_BUILD_TARGET = stdenv.hostPlatform.rust.rustcTargetSpec;
|
||||
}
|
||||
// lib.optionalAttrs selinuxSupport {
|
||||
SELINUX_INCLUDE_DIR = "${libselinux.dev}/include";
|
||||
SELINUX_INCLUDE_DIR = "${lib.getInclude libselinux}/include";
|
||||
SELINUX_LIB_DIR = lib.makeLibraryPath [
|
||||
libselinux
|
||||
];
|
||||
|
||||
Reference in New Issue
Block a user