From 7f144d8f09c548ea0cd24969d53e76757f74592d Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 7 Jan 2016 10:06:07 +0100
Subject: batman-adv: 2014.4.0 -> 2015.2

---
 pkgs/os-specific/linux/batman-adv/alfred.nix  |  9 +++++----
 pkgs/os-specific/linux/batman-adv/batctl.nix  | 11 +++++++----
 pkgs/os-specific/linux/batman-adv/default.nix |  6 +++---
 3 files changed, 15 insertions(+), 11 deletions(-)

(limited to 'pkgs/os-specific/linux/batman-adv')

diff --git a/pkgs/os-specific/linux/batman-adv/alfred.nix b/pkgs/os-specific/linux/batman-adv/alfred.nix
index 2d9f5079586c..a42194d71932 100644
--- a/pkgs/os-specific/linux/batman-adv/alfred.nix
+++ b/pkgs/os-specific/linux/batman-adv/alfred.nix
@@ -1,17 +1,18 @@
-{ stdenv, fetchurl, pkgconfig, gpsd }:
+{ stdenv, fetchurl, pkgconfig, gpsd, libcap }:
 
 let
-  ver = "2014.4.0";
+  ver = "2015.2";
 in
 stdenv.mkDerivation rec {
   name = "alfred-${ver}";
 
   src = fetchurl {
     url = "http://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz";
-    sha256 = "99e6c64e7069b0b7cb861369d5c198bfc7d74d41509b8edd8a17ba78e7c8d034";
+    sha256 = "0cyr3bxwypddifg18yi3i5mcdam8izlq3ayrbkjir2b4vqhixs3s";
   };
 
-  buildInputs = [ pkgconfig gpsd ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ gpsd libcap ];
 
   preBuild = ''
     makeFlags="PREFIX=$out PKG_CONFIG=${pkgconfig}/bin/pkg-config"
diff --git a/pkgs/os-specific/linux/batman-adv/batctl.nix b/pkgs/os-specific/linux/batman-adv/batctl.nix
index 5ac3e6b4117f..3ea4fc5f96ec 100644
--- a/pkgs/os-specific/linux/batman-adv/batctl.nix
+++ b/pkgs/os-specific/linux/batman-adv/batctl.nix
@@ -1,18 +1,21 @@
-{stdenv, fetchurl}:
+{ stdenv, fetchurl, pkgconfig, libnl }:
 
 let
-  ver = "2014.4.0";
+  ver = "2015.2";
 in
 stdenv.mkDerivation rec {
   name = "batctl-${ver}";
 
   src = fetchurl {
     url = "http://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz";
-    sha256 = "4deae3b6664d0d13acf7a8ece74175a31a72fe58fb15cb9112a9a2014b32cb4c";
+    sha256 = "1yv9i304bicm34mgl387c21ynv711yr2m5ycx9hjbxprkyzjlkdi";
   };
 
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ libnl ];
+
   preBuild = ''
-    makeFlags=PREFIX=$out
+    makeFlags="PREFIX=$out PKG_CONFIG=${pkgconfig}/bin/pkg-config"
   '';
 
   meta = {
diff --git a/pkgs/os-specific/linux/batman-adv/default.nix b/pkgs/os-specific/linux/batman-adv/default.nix
index 341b6f3af1d5..e50d613624d0 100644
--- a/pkgs/os-specific/linux/batman-adv/default.nix
+++ b/pkgs/os-specific/linux/batman-adv/default.nix
@@ -1,15 +1,15 @@
 { stdenv, fetchurl, kernel }:
 
-assert stdenv.lib.versionOlder kernel.version "3.17";
+#assert stdenv.lib.versionOlder kernel.version "3.17";
 
-let base = "batman-adv-2014.4.0"; in
+let base = "batman-adv-2015.2"; in
 
 stdenv.mkDerivation rec {
   name = "${base}-${kernel.version}";
 
   src = fetchurl {
     url = "http://downloads.open-mesh.org/batman/releases/${base}/${base}.tar.gz";
-    sha256 = "757b9ddd346680f6fd87dc28fde6da0ddc0423a65fbc88fdbaa7b247fed2c1a8";
+    sha256 = "0lj8q9fnrf9n434h9wb2385z65skmq8q64svx5hbnlcj0bjhyxw6";
   };
 
   preBuild = ''
-- 
cgit 1.4.1