From 06238ced3c77dde5b222f318dea0f1d1340c5981 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 24 Feb 2020 17:06:41 -0500 Subject: [PATCH 1/2] vde2: fix build with latest openssl --- pkgs/tools/networking/vde2/default.nix | 15 +++++++++++---- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/networking/vde2/default.nix b/pkgs/tools/networking/vde2/default.nix index e43c174ab3f..55d83eb719c 100644 --- a/pkgs/tools/networking/vde2/default.nix +++ b/pkgs/tools/networking/vde2/default.nix @@ -8,12 +8,19 @@ stdenv.mkDerivation rec { sha256 = "14xga0ib6p1wrv3hkl4sa89yzjxv7f1vfqaxsch87j6scdm59pr2"; }; - patches = stdenv.lib.optional stdenv.hostPlatform.isMusl ( - fetchpatch { + patches = [ + # Fix build with openssl 1.1.0 + (fetchpatch { + name = "vde_cryptcab-compile-against-openssl-1.1.0.patch"; + url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/vde_cryptcab-compile-against-openssl-1.1.0.patch?h=packages/vde2&id=15b11be49997fa94b603e366064690b7cc6bce61"; + sha256 = "07z1yabwigq35mkwzqa934n7vjnjlqz5xfzq8cfj87lgyjjp00qi"; + }) + ] ++ 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"; - } - ); + }) + ]; configureFlags = stdenv.lib.optional (!withPython) "--disable-python"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 17b0779bc90..c1179161d3a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7102,9 +7102,7 @@ in vbetool = callPackage ../tools/system/vbetool { }; - vde2 = callPackage ../tools/networking/vde2 { - openssl = openssl_1_0_2; - }; + vde2 = callPackage ../tools/networking/vde2 { }; vboot_reference = callPackage ../tools/system/vboot_reference {}; From e5c3bb410334699acc59a8a52fd1176a13c0779d Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 24 Feb 2020 18:36:50 -0500 Subject: [PATCH 2/2] vde2: update homepage --- pkgs/tools/networking/vde2/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/vde2/default.nix b/pkgs/tools/networking/vde2/default.nix index 55d83eb719c..be3d1267861 100644 --- a/pkgs/tools/networking/vde2/default.nix +++ b/pkgs/tools/networking/vde2/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; meta = with stdenv.lib; { - homepage = http://vde.sourceforge.net/; + homepage = "https://github.com/virtualsquare/vde-2"; description = "Virtual Distributed Ethernet, an Ethernet compliant virtual network"; platforms = platforms.unix; license = licenses.gpl2;