diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2018-04-11 14:55:52 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-04-11 14:55:52 +0200 |
commit | ee6894ca1297afe0caf2f389c1f9a9220826b749 (patch) | |
tree | 02f96b5744cef8bc55010fb8301f5b50c0748d4c /pkgs/tools/networking/vde2/default.nix | |
parent | 392874b9b1411dc7b879997bd8776b921feea61d (diff) | |
parent | 617c26df84d5670574864a9ccad0eaf8708bd86a (diff) | |
download | nixlib-ee6894ca1297afe0caf2f389c1f9a9220826b749.tar nixlib-ee6894ca1297afe0caf2f389c1f9a9220826b749.tar.gz nixlib-ee6894ca1297afe0caf2f389c1f9a9220826b749.tar.bz2 nixlib-ee6894ca1297afe0caf2f389c1f9a9220826b749.tar.lz nixlib-ee6894ca1297afe0caf2f389c1f9a9220826b749.tar.xz nixlib-ee6894ca1297afe0caf2f389c1f9a9220826b749.tar.zst nixlib-ee6894ca1297afe0caf2f389c1f9a9220826b749.zip |
Merge staging into master
Diffstat (limited to 'pkgs/tools/networking/vde2/default.nix')
-rw-r--r-- | pkgs/tools/networking/vde2/default.nix | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/tools/networking/vde2/default.nix b/pkgs/tools/networking/vde2/default.nix index ff54e1ab2d21..39674d22aa1d 100644 --- a/pkgs/tools/networking/vde2/default.nix +++ b/pkgs/tools/networking/vde2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, libpcap, python2 }: +{ stdenv, fetchurl, fetchpatch, openssl, libpcap, python2 }: stdenv.mkDerivation rec { name = "vde2-2.3.2"; @@ -8,6 +8,14 @@ stdenv.mkDerivation rec { sha256 = "14xga0ib6p1wrv3hkl4sa89yzjxv7f1vfqaxsch87j6scdm59pr2"; }; + patches = stdenv.lib.optional stdenv.hostPlatform.isMusl ( + fetchpatch { + url = "https://git.alpinelinux.org/cgit/aports/plain/main/vde2/musl-build-fix.patch?id=ddee2f86a48e087867d4a2c12849b2e3baccc238"; + sha256 = "0b5382v541bkxhqylilcy34bh83ag96g71f39m070jzvi84kx8af"; + } + ); + + buildInputs = [ openssl libpcap python2 ]; hardeningDisable = [ "format" ]; |