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

Merge branch 'pkg/batman-adv-2015.2' of git://github.com/mayflower/nixpkgs

Browse Source
This commit is contained in:
Shea Levy 2016-01-07 14:37:50 -05:00
commit 57e0febda6
3 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/os-specific/linux/batman-adv/alfred.nix
View File

@ -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"

11
pkgs/os-specific/linux/batman-adv/batctl.nix
View File

@ -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 = {

6
pkgs/os-specific/linux/batman-adv/default.nix
View File

@ -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 = ''