fixup! epics-base: fix compilation due to GNUMake 4.4 upgrade

epics-extensions · Jul 4, 2023 · 9bd69f1 · 9bd69f1
1 parent 8088028
commit 9bd69f1
Showing 1 changed file with 3 additions and 2 deletions.
diff --git 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