colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

olsrd: 0.9.6.1 -> 0.9.8, fix build

Browse Source 
incorporate patch fixing build against bison 3.7 pinched from openwrt
This commit is contained in:
Robert Scott 2020-10-04 20:58:11 +01:00
parent 57a9fc1246
commit 36d66c0b43
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/tools/networking/olsrd/default.nix
View File

@ -1,14 +1,25 @@
{ stdenv, fetchurl, bison, flex }:
{ stdenv, fetchFromGitHub, fetchpatch, bison, flex }:
stdenv.mkDerivation rec {
pname = "olsrd";
version = "0.9.6.1";
version = "0.9.8";
src = fetchurl {
url = "http://www.olsr.org/releases/0.9/${pname}-${version}.tar.bz2";
sha256 = "9cac290e9bff5fc7422110b9ccd972853f10962c962d2f31a63de9c6d1520612";
src = fetchFromGitHub {
owner = "OLSR";
repo = pname;
rev = "v${version}";
sha256 = "1xk355dm5pfjil1j4m724vkdnc178lv6hi6s1g0xgpd59avbx90j";
};
patches = [
# remove if there's ever an upstream release that incorporates
# https://github.com/OLSR/olsrd/pull/87
(fetchpatch {
url = "https://raw.githubusercontent.com/openwrt-routing/packages/b3897386771890ba1b15f672c2fed58630beedef/olsrd/patches/011-bison.patch";
sha256 = "04cl4b8dpr1yjs7wa94jcszmkdzpnrn719a5m9nhm7lvfrn1rzd0";
})
];
buildInputs = [ bison flex ];
preConfigure = ''