ocf-resource-agents: enable strictDeps, modernize (#509237)
This commit is contained in:
@@ -8,6 +8,7 @@
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
autoreconfHook,
|
||||
bashNonInteractive,
|
||||
pkg-config,
|
||||
python3,
|
||||
glib,
|
||||
@@ -23,15 +24,15 @@ let
|
||||
forOCF = true;
|
||||
};
|
||||
|
||||
resource-agentsForOCF = stdenv.mkDerivation rec {
|
||||
resource-agentsForOCF = stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "resource-agents";
|
||||
version = "4.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ClusterLabs";
|
||||
repo = "resource-agents";
|
||||
rev = "v${version}";
|
||||
sha256 = "0haryi3yrszdfpqnkfnppxj1yiy6ipah6m80snvayc7v0ss0wnir";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-OVoOtAb7MK+21QBVA9WNxkcfZL/Xumnxde3r7Ef0WUE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -47,13 +48,16 @@ let
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
python3
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
bashNonInteractive
|
||||
glib
|
||||
python3
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = toString (
|
||||
lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "12") [
|
||||
# Needed with GCC 12 but breaks on darwin (with clang) or older gcc
|
||||
@@ -71,7 +75,7 @@ let
|
||||
astro
|
||||
];
|
||||
};
|
||||
};
|
||||
});
|
||||
|
||||
in
|
||||
|
||||
|
||||
Reference in New Issue
Block a user