public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #56599 from andir/tinc-openssl-102r-fix

Browse Source 
tinc_pre: fix error after openssl upgrade
This commit is contained in:
Franz Pletz 2019-03-02 00:21:15 +00:00 committed by GitHub
commit 5e3b160b5c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/tools/networking/tinc/pre.nix
View File

@ -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 { stdenv.mkDerivation rec {
name = "tinc-${version}"; name = "tinc-${version}";
@ -12,6 +12,14 @@ stdenv.mkDerivation rec {
outputs = [ "out" "man" "info" ]; 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 ]; nativeBuildInputs = [ autoreconfHook texinfo ];
buildInputs = [ ncurses readline zlib lzo openssl ]; buildInputs = [ ncurses readline zlib lzo openssl ];