From 9bd69f18d88c6871cc082d01630fc7e93e4812d6 Mon Sep 17 00:00:00 2001 From: Minijackson Date: Tue, 4 Jul 2023 11:01:00 +0200 Subject: [PATCH] fixup! epics-base: fix compilation due to GNUMake 4.4 upgrade --- pkgs/epnix/epics-base/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/epnix/epics-base/default.nix b/pkgs/epnix/epics-base/default.nix index a871e74e..8acc2265 100644 --- a/pkgs/epnix/epics-base/default.nix +++ b/pkgs/epnix/epics-base/default.nix @@ -12,6 +12,7 @@ }: with lib; let older = versionOlder version; + atLeast = versionAtLeast version; generateConf = (epnixLib.formats.make {}).generate; @@ -36,10 +37,10 @@ in }; patches = - [ + (optionals (atLeast "7.0.0") [ # From: https://github.com/epics-base/epics-base/pull/395 ./fix-makeflags-parsing-4.4.patch - ] + ]) ++ (optionals (older "7.0.5") [ # Support "undefine MYVAR" in convertRelease.pl # Fixed by commit 79d7ac931502e1c25b247a43b7c4454353ac13a6