pyrox.dev
Merge branch 'pkg/batman-adv-2015.2' of git://github.com/mayflower/nixpkgs
+5
-4
pkgs/os-specific/linux/batman-adv/alfred.nix
+5
-4
pkgs/os-specific/linux/batman-adv/alfred.nix
···
1
-
{ stdenv, fetchurl, pkgconfig, gpsd }:
1
+
{ stdenv, fetchurl, pkgconfig, gpsd, libcap }:
2
2
3
3
let
4
-
ver = "2014.4.0";
4
+
ver = "2015.2";
5
5
in
6
6
stdenv.mkDerivation rec {
7
7
name = "alfred-${ver}";
8
8
9
9
src = fetchurl {
10
10
url = "http://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz";
11
-
sha256 = "99e6c64e7069b0b7cb861369d5c198bfc7d74d41509b8edd8a17ba78e7c8d034";
11
+
sha256 = "0cyr3bxwypddifg18yi3i5mcdam8izlq3ayrbkjir2b4vqhixs3s";
12
12
};
13
13
14
-
buildInputs = [ pkgconfig gpsd ];
14
+
nativeBuildInputs = [ pkgconfig ];
15
+
buildInputs = [ gpsd libcap ];
15
16
16
17
preBuild = ''
17
18
makeFlags="PREFIX=$out PKG_CONFIG=${pkgconfig}/bin/pkg-config"
+7
-4
pkgs/os-specific/linux/batman-adv/batctl.nix
+7
-4
pkgs/os-specific/linux/batman-adv/batctl.nix
···
1
-
{stdenv, fetchurl}:
1
+
{ stdenv, fetchurl, pkgconfig, libnl }:
2
2
3
3
let
4
-
ver = "2014.4.0";
4
+
ver = "2015.2";
5
5
in
6
6
stdenv.mkDerivation rec {
7
7
name = "batctl-${ver}";
8
8
9
9
src = fetchurl {
10
10
url = "http://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz";
11
-
sha256 = "4deae3b6664d0d13acf7a8ece74175a31a72fe58fb15cb9112a9a2014b32cb4c";
11
+
sha256 = "1yv9i304bicm34mgl387c21ynv711yr2m5ycx9hjbxprkyzjlkdi";
12
12
};
13
13
14
+
nativeBuildInputs = [ pkgconfig ];
15
+
buildInputs = [ libnl ];
16
+
14
17
preBuild = ''
15
-
makeFlags=PREFIX=$out
18
+
makeFlags="PREFIX=$out PKG_CONFIG=${pkgconfig}/bin/pkg-config"
16
19
'';
17
20
18
21
meta = {
+3
-3
pkgs/os-specific/linux/batman-adv/default.nix
+3
-3
pkgs/os-specific/linux/batman-adv/default.nix
···
1
1
{ stdenv, fetchurl, kernel }:
2
2
3
-
assert stdenv.lib.versionOlder kernel.version "3.17";
3
+
#assert stdenv.lib.versionOlder kernel.version "3.17";
4
4
5
-
let base = "batman-adv-2014.4.0"; in
5
+
let base = "batman-adv-2015.2"; in
6
6
7
7
stdenv.mkDerivation rec {
8
8
name = "${base}-${kernel.version}";
9
9
10
10
src = fetchurl {
11
11
url = "http://downloads.open-mesh.org/batman/releases/${base}/${base}.tar.gz";
12
-
sha256 = "757b9ddd346680f6fd87dc28fde6da0ddc0423a65fbc88fdbaa7b247fed2c1a8";
12
+
sha256 = "0lj8q9fnrf9n434h9wb2385z65skmq8q64svx5hbnlcj0bjhyxw6";
13
13
};
14
14
15
15
preBuild = ''