3
0
Fork 0
forked from mirrors/nixpkgs

spdk: 20.04.1 -> 21.04

This commit is contained in:
Jörg Thalheim 2021-05-24 08:22:01 +02:00
parent a443ea7d01
commit 00a7a0f609
No known key found for this signature in database
GPG key ID: B3F5D81B0C6967C4

View file

@ -13,31 +13,17 @@
, openssl , openssl
}: }:
let stdenv.mkDerivation rec {
dpdk-compat-patch = fetchurl {
url = "https://review.spdk.io/gerrit/plugins/gitiles/spdk/spdk/+/6acb9a58755856fb9316baf9dbbb7239dc6b9446%5E%21/?format=TEXT";
sha256 = "18q0956fkjw19r29hp16x4pygkfv01alj9cld2wlqqyfgp41nhn0";
};
in stdenv.mkDerivation rec {
pname = "spdk"; pname = "spdk";
version = "20.04.1"; version = "21.04";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "spdk"; owner = "spdk";
repo = "spdk"; repo = "spdk";
rev = "v${version}"; rev = "v${version}";
sha256 = "ApMyGamPrMalzZLbVkJlcwatiB8dOJmoxesdjkWZElk="; sha256 = "sha256-Xmmgojgtt1HwTqG/1ZOJVo1BcdAH0sheu40d73OJ68w=";
}; };
patches = [
./spdk-dpdk-meson.patch
# https://review.spdk.io/gerrit/c/spdk/spdk/+/3134
(fetchpatch {
url = "https://github.com/spdk/spdk/commit/c954b5b722c5c163774d3598458ff726c48852ab.patch";
sha256 = "1n149hva5qxmpr0nmav10nya7zklafxi136f809clv8pag84g698";
})
];
nativeBuildInputs = [ nativeBuildInputs = [
python3 python3
]; ];
@ -48,12 +34,13 @@ in stdenv.mkDerivation rec {
postPatch = '' postPatch = ''
patchShebangs . patchShebangs .
base64 -d ${dpdk-compat-patch} | patch -p1
''; '';
configureFlags = [ "--with-dpdk=${dpdk}" ]; configureFlags = [ "--with-dpdk=${dpdk}" ];
NIX_CFLAGS_COMPILE = "-mssse3"; # Necessary to compile. NIX_CFLAGS_COMPILE = "-mssse3"; # Necessary to compile.
# otherwise does not find strncpy when compiling
NIX_LDFLAGS = "-lbsd";
enableParallelBuilding = true; enableParallelBuilding = true;