Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

vde2: fix build with latest openssl #80986

Merged
merged 2 commits into from
Feb 25, 2020
Merged

vde2: fix build with latest openssl #80986

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
06238ce
vde2: fix build with latest openssl
worldofpeace Feb 24, 2020
e5c3bb4
vde2: update homepage
worldofpeace Feb 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions pkgs/tools/networking/vde2/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand All @@ -23,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;
Expand Down
4 changes: 1 addition & 3 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {};

Expand Down