Merge pull request #179316 from NickCao/bird
This commit is contained in:
commit
b213d85ced
@ -1,11 +1,11 @@
|
|||||||
{ lib, stdenv, fetchurl, fetchpatch, flex, bison, readline, libssh, nixosTests }:
|
{ lib, stdenv, fetchurl, flex, bison, readline, libssh, nixosTests }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "bird";
|
pname = "bird";
|
||||||
version = "2.0.9";
|
version = "2.0.10";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
sha256 = "sha256-dnhrvN7TBh4bsiGwEfLMACIewGPenNoASn2bBhoJbV4=";
|
sha256 = "sha256-ftNB3djch/qXNlhrNRVEeoQ2/sRC1l9AIhVaud4f/Vo=";
|
||||||
url = "ftp://bird.network.cz/pub/bird/${pname}-${version}.tar.gz";
|
url = "ftp://bird.network.cz/pub/bird/${pname}-${version}.tar.gz";
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -14,10 +14,6 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
./dont-create-sysconfdir-2.patch
|
./dont-create-sysconfdir-2.patch
|
||||||
(fetchurl {
|
|
||||||
url = "https://gitlab.nic.cz/labs/bird/-/commit/fcb4dd0c831339c4374ace17d8f2ae6ebfeed279.patch";
|
|
||||||
sha256 = "sha256-PEgpRnOGLa1orHJDEHlblnVhBVv7XOKPR70M1wUMxMQ=";
|
|
||||||
})
|
|
||||||
];
|
];
|
||||||
|
|
||||||
CPP="${stdenv.cc.targetPrefix}cpp -E";
|
CPP="${stdenv.cc.targetPrefix}cpp -E";
|
||||||
|
Loading…
Reference in New Issue
Block a user