diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2019-03-02 00:21:15 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-02 00:21:15 +0000 |
| commit | 5e3b160b5c0ce20cab872aa8796aee90ab400196 (patch) | |
| tree | 398c11b25ec717f86b7105e587aab6176fcfc0b9 | |
| parent | 9edb85130841e0e3b18f68564b68398a343cd230 (diff) | |
| parent | 447c21089ba055f151d49b362576e1cf12065948 (diff) | |
| download | nixpkgs-5e3b160b5c0ce20cab872aa8796aee90ab400196.tar nixpkgs-5e3b160b5c0ce20cab872aa8796aee90ab400196.tar.gz nixpkgs-5e3b160b5c0ce20cab872aa8796aee90ab400196.tar.bz2 nixpkgs-5e3b160b5c0ce20cab872aa8796aee90ab400196.tar.lz nixpkgs-5e3b160b5c0ce20cab872aa8796aee90ab400196.tar.xz nixpkgs-5e3b160b5c0ce20cab872aa8796aee90ab400196.tar.zst nixpkgs-5e3b160b5c0ce20cab872aa8796aee90ab400196.zip | |
Merge pull request #56599 from andir/tinc-openssl-102r-fix
tinc_pre: fix error after openssl upgrade
| -rw-r--r-- | pkgs/tools/networking/tinc/pre.nix | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/tools/networking/tinc/pre.nix b/pkgs/tools/networking/tinc/pre.nix index 4c3c428d3f0..df9eb9bdad2 100644 --- a/pkgs/tools/networking/tinc/pre.nix +++ b/pkgs/tools/networking/tinc/pre.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, autoreconfHook, texinfo, ncurses, readline, zlib, lzo, openssl }: +{ stdenv, fetchgit, fetchpatch, autoreconfHook, texinfo, ncurses, readline, zlib, lzo, openssl }: stdenv.mkDerivation rec { name = "tinc-${version}"; @@ -12,6 +12,14 @@ stdenv.mkDerivation rec { outputs = [ "out" "man" "info" ]; + patches = [ + (fetchpatch { + name = "tinc-openssl-1.0.2r.patch"; + url = "http://git.tinc-vpn.org/git/browse?p=tinc;a=patch;h=2b0aeec02d64bb4724da9ff1dbc19b7d35d7c904"; + sha256 = "0kidzlmgl0cin4g54ygcxa0jbq9vwlk3dyq5f65nkjd8yvayfzi8"; + }) + ]; + nativeBuildInputs = [ autoreconfHook texinfo ]; buildInputs = [ ncurses readline zlib lzo openssl ]; |