uutils-coreutils: 0.4.0 -> 0.5.0 (#470746)
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.4.0";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "uutils";
|
||||
repo = "coreutils";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-4C4i3oHw9WHwuq9DOufRvc/tOdwqHmYF/gUr2VkRmwM=";
|
||||
hash = "sha256-U9godsxtyWOFhrE8CaQesWoeKWmitADp2jyJU/1fPKA=";
|
||||
};
|
||||
|
||||
# error: linker `aarch64-linux-gnu-gcc` not found
|
||||
@@ -36,15 +36,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
'';
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) src;
|
||||
name = "uutils-coreutils-${finalAttrs.version}";
|
||||
hash = "sha256-Xei7FIcJr5lr8+uC6veE2hnLPr1UjC/ooZxW6TWKsT8=";
|
||||
inherit (finalAttrs) pname src version;
|
||||
hash = "sha256-V53qD7SujN8bEdNwcBshdkNeYdk+4Whr+XiYHO1iLXs=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./selinux_no_auto_detect.diff
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
lib.optionals (lib.meta.availableOn stdenv.hostPlatform acl) [
|
||||
acl
|
||||
|
||||
@@ -1,36 +0,0 @@
|
||||
diff --git a/GNUmakefile b/GNUmakefile
|
||||
index e4bc5f435..b677d119c 100644
|
||||
--- a/GNUmakefile
|
||||
+++ b/GNUmakefile
|
||||
@@ -76,19 +76,6 @@ ifeq ($(OS),Windows_NT)
|
||||
endif
|
||||
LN ?= ln -sf
|
||||
|
||||
-ifdef SELINUX_ENABLED
|
||||
- override SELINUX_ENABLED := 0
|
||||
-# Now check if we should enable it (only on non-Windows)
|
||||
- ifneq ($(OS),Windows_NT)
|
||||
- ifeq ($(shell if [ -x /sbin/selinuxenabled ] && /sbin/selinuxenabled 2>/dev/null; then echo 0; else echo 1; fi),0)
|
||||
- override SELINUX_ENABLED := 1
|
||||
-$(info /sbin/selinuxenabled successful)
|
||||
- else
|
||||
-$(info SELINUX_ENABLED=1 but /sbin/selinuxenabled failed)
|
||||
- endif
|
||||
- endif
|
||||
-endif
|
||||
-
|
||||
# Possible programs
|
||||
PROGS := \
|
||||
arch \
|
||||
@@ -224,8 +211,10 @@ endif
|
||||
|
||||
ifneq ($(OS),Windows_NT)
|
||||
PROGS := $(PROGS) $(UNIX_PROGS)
|
||||
+ ifeq ($(SELINUX_ENABLED),1)
|
||||
# Build the selinux command even if not on the system
|
||||
- PROGS := $(PROGS) $(SELINUX_PROGS)
|
||||
+ PROGS := $(PROGS) $(SELINUX_PROGS)
|
||||
+ endif
|
||||
endif
|
||||
|
||||
UTILS ?= $(filter-out $(SKIP_UTILS),$(PROGS))
|
||||
Reference in New Issue
Block a user