about summary refs log tree commit diff
path: root/pkgs/servers/bird
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2019-01-06 14:26:03 +0100
committerVladimír Čunát <vcunat@gmail.com>2019-01-06 14:26:03 +0100
commitc6b8312f21484f5948413ac4e80747cb41fa8c43 (patch)
tree51575a254ecb53a0641db920b1680d00c4a2b45e /pkgs/servers/bird
parent4bb0a719cf8f6b89ec89cd902a511a7e043d9a0d (diff)
bird2: fixup build after 7bb24a65e
I didn't look whether bird2 cross-compiles, but the patch wouldn't apply.
Diffstat (limited to 'pkgs/servers/bird')
-rw-r--r--pkgs/servers/bird/default.nix4
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/servers/bird/default.nix b/pkgs/servers/bird/default.nix
index 94579e1bdb166..7e0bf298b029e 100644
--- a/pkgs/servers/bird/default.nix
+++ b/pkgs/servers/bird/default.nix
@@ -18,12 +18,14 @@ let
 
       patches = [
         (./. + "/dont-create-sysconfdir-${builtins.substring 0 1 version}.patch")
+      ]
+      ++ optional (lib.versionOlder version "2")
         # https://github.com/BIRD/bird/pull/4
         (fetchpatch {
           url = "https://github.com/BIRD/bird/commit/fca9ab48e3823c734886f47156a92f6b804c16e9.patch";
           sha256 = "1pnndc3n56lqqcy74ln0w5kn3i9rbzsm2dqiyp1qw7j33dpkln1b";
         })
-      ];
+        ;
 
       CPP="${stdenv.cc.targetPrefix}cpp -E";