From c6b8312f21484f5948413ac4e80747cb41fa8c43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 6 Jan 2019 14:26:03 +0100 Subject: [PATCH] bird2: fixup build after 7bb24a65e I didn't look whether bird2 cross-compiles, but the patch wouldn't apply. --- pkgs/servers/bird/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/bird/default.nix b/pkgs/servers/bird/default.nix index 94579e1bdb1..7e0bf298b02 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";