diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2020-02-24 17:06:41 -0500 |
|---|---|---|
| committer | worldofpeace <worldofpeace@protonmail.ch> | 2020-02-24 17:06:56 -0500 |
| commit | 06238ced3c77dde5b222f318dea0f1d1340c5981 (patch) | |
| tree | 6afe92a3298099eb620b912d7f835f80342253c4 /pkgs/tools/networking | |
| parent | 9237dc588e6c7c0d8166c00d7d551926ac7c288d (diff) | |
| download | nixlib-06238ced3c77dde5b222f318dea0f1d1340c5981.tar nixlib-06238ced3c77dde5b222f318dea0f1d1340c5981.tar.gz nixlib-06238ced3c77dde5b222f318dea0f1d1340c5981.tar.bz2 nixlib-06238ced3c77dde5b222f318dea0f1d1340c5981.tar.lz nixlib-06238ced3c77dde5b222f318dea0f1d1340c5981.tar.xz nixlib-06238ced3c77dde5b222f318dea0f1d1340c5981.tar.zst nixlib-06238ced3c77dde5b222f318dea0f1d1340c5981.zip | |
vde2: fix build with latest openssl
Diffstat (limited to 'pkgs/tools/networking')
| -rw-r--r-- | pkgs/tools/networking/vde2/default.nix | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/pkgs/tools/networking/vde2/default.nix b/pkgs/tools/networking/vde2/default.nix index e43c174ab3f5..55d83eb719ce 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"; |