summary refs log tree commit diff
diff options
context:
space:
mode:
authorJörg Thalheim <joerg@thalheim.io>2018-12-11 11:25:13 +0000
committerRobin Gloster <mail@glob.in>2018-12-11 18:13:21 +0100
commit7bb24a65e4d429ed01736a168687ade3240d6ccd (patch)
tree0c2c8f05008c25de8d359f4eec3bbeed5db252a1
parent8871ffccffe2e626c0bf326e8253aa1c692be6f5 (diff)
downloadnixpkgs-7bb24a65e4d429ed01736a168687ade3240d6ccd.tar
nixpkgs-7bb24a65e4d429ed01736a168687ade3240d6ccd.tar.gz
nixpkgs-7bb24a65e4d429ed01736a168687ade3240d6ccd.tar.bz2
nixpkgs-7bb24a65e4d429ed01736a168687ade3240d6ccd.tar.lz
nixpkgs-7bb24a65e4d429ed01736a168687ade3240d6ccd.tar.xz
nixpkgs-7bb24a65e4d429ed01736a168687ade3240d6ccd.tar.zst
nixpkgs-7bb24a65e4d429ed01736a168687ade3240d6ccd.zip
bird: fix cross-build
-rw-r--r--pkgs/servers/bird/default.nix9
1 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/servers/bird/default.nix b/pkgs/servers/bird/default.nix
index 5683da5e8e3..94579e1bdb1 100644
--- a/pkgs/servers/bird/default.nix
+++ b/pkgs/servers/bird/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, flex, bison, readline }:
+{ lib, stdenv, fetchurl, fetchpatch, flex, bison, readline }:
 
 with lib;
 
@@ -18,8 +18,15 @@ let
 
       patches = [
         (./. + "/dont-create-sysconfdir-${builtins.substring 0 1 version}.patch")
+        # 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";
+
       configureFlags = [
         "--localstatedir=/var"
       ] ++ optional enableIPv6 "--enable-ipv6";