ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2025-01-08 22:57:42 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #80986 from worldofpeace/vde2-openssl

Browse Source 
vde2: fix build with latest openssl
This commit is contained in:
Florian Klink 2020-02-25 14:40:44 -08:00 committed by GitHub
commit 2debd30cf0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/tools/networking/vde2/default.nix
View File

@ -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";
@ -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;

4
pkgs/top-level/all-packages.nix
View File

@ -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 {};