diff options
author | Shea Levy <shea@shealevy.com> | 2016-01-07 14:37:50 -0500 |
---|---|---|
committer | Shea Levy <shea@shealevy.com> | 2016-01-07 14:37:50 -0500 |
commit | 57e0febda6ea93b226d1e8ac7dbd40f4f92e4980 (patch) | |
tree | 855195823bddecd237c824b77879155d53616364 /pkgs/os-specific/linux | |
parent | 025770fdd9d65e30fd0f2839d8e1e0da188073b5 (diff) | |
parent | 7f144d8f09c548ea0cd24969d53e76757f74592d (diff) | |
download | nixlib-57e0febda6ea93b226d1e8ac7dbd40f4f92e4980.tar nixlib-57e0febda6ea93b226d1e8ac7dbd40f4f92e4980.tar.gz nixlib-57e0febda6ea93b226d1e8ac7dbd40f4f92e4980.tar.bz2 nixlib-57e0febda6ea93b226d1e8ac7dbd40f4f92e4980.tar.lz nixlib-57e0febda6ea93b226d1e8ac7dbd40f4f92e4980.tar.xz nixlib-57e0febda6ea93b226d1e8ac7dbd40f4f92e4980.tar.zst nixlib-57e0febda6ea93b226d1e8ac7dbd40f4f92e4980.zip |
Merge branch 'pkg/batman-adv-2015.2' of git://github.com/mayflower/nixpkgs
Diffstat (limited to 'pkgs/os-specific/linux')
-rw-r--r-- | pkgs/os-specific/linux/batman-adv/alfred.nix | 9 | ||||
-rw-r--r-- | pkgs/os-specific/linux/batman-adv/batctl.nix | 11 | ||||
-rw-r--r-- | pkgs/os-specific/linux/batman-adv/default.nix | 6 |
3 files changed, 15 insertions, 11 deletions
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 = '' |