cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

vde2: 2.3.2 -> 2.3.3

Browse source 
https://github.com/virtualsquare/vde-2/releases/tag/v2.3.3
This commit is contained in:
zowoq 2022-06-16 10:05:47 +10:00
parent 60f71bd72a
commit 56b840f07b
1 changed files with 10 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
pkgs/tools/networking/vde2/default.nix
View file

@ -1,22 +1,17 @@
{ lib, stdenv, fetchurl, fetchpatch, openssl, libpcap, python2, withPython ? false }:
{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, libpcap, wolfssl }:
stdenv.mkDerivation rec {
pname = "vde2";
version = "2.3.2";
version = "2.3.3";
src = fetchurl {
url = "mirror://sourceforge/vde/vde2/${version}/vde2-${version}.tar.gz";
sha256 = "14xga0ib6p1wrv3hkl4sa89yzjxv7f1vfqaxsch87j6scdm59pr2";
src = fetchFromGitHub {
owner = "virtualsquare";
repo = "vde-2";
rev = "v${version}";
sha256 = "sha256-Yf6QB7j5lYld2XtqhYspK4037lTtimoFc7nCavCP+mU=";
};
patches = [
# Fix build with openssl 1.1.0
(fetchpatch {
name = "vde_cryptcab-compile-against-openssl-1.1.0.patch";
url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/15b11be49997fa94b603e366064690b7cc6bce61/trunk/vde_cryptcab-compile-against-openssl-1.1.0.patch";
sha256 = "07z1yabwigq35mkwzqa934n7vjnjlqz5xfzq8cfj87lgyjjp00qi";
})
] ++ lib.optional stdenv.hostPlatform.isMusl [
patches = lib.optional stdenv.hostPlatform.isMusl [
(fetchpatch {
url = "https://git.alpinelinux.org/aports/plain/main/vde2/musl-build-fix.patch?id=ddee2f86a48e087867d4a2c12849b2e3baccc238";
sha256 = "0b5382v541bkxhqylilcy34bh83ag96g71f39m070jzvi84kx8af";
@ -27,19 +22,9 @@ stdenv.mkDerivation rec {
MACOSX_DEPLOYMENT_TARGET=10.16
'';
configureFlags = lib.optional (!withPython) "--disable-python";
nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ openssl libpcap ]
++ lib.optional withPython python2;
hardeningDisable = [ "format" ];
# Disable parallel build as it fails as:
# make: *** No rule to make target '../../src/lib/libvdemgmt.la',
# needed by 'libvdesnmp.la'. Stop.
# Next release should address it with
# https://github.com/virtualsquare/vde-2/commit/7dd9ed46d5dca125ca45d679ac9f3acbfb0f9300.patch
enableParallelBuilding = false;
buildInputs = [ libpcap wolfssl ];
meta = with lib; {
homepage = "https://github.com/virtualsquare/vde-2";