From 16cc4dd3a3cde61c3dd66f96d27f6a699188ee01 Mon Sep 17 00:00:00 2001 From: Kranium Gikos Mendoza Date: Sat, 16 Jul 2016 21:07:21 +0800 Subject: [PATCH] vtun: add debian gcc5 fix --- pkgs/tools/networking/vtun/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/vtun/default.nix b/pkgs/tools/networking/vtun/default.nix index b0397149e60d..09f48d9fa1ad 100644 --- a/pkgs/tools/networking/vtun/default.nix +++ b/pkgs/tools/networking/vtun/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, lzo, zlib, yacc, flex }: +{ stdenv, fetchurl, fetchpatch, openssl, lzo, zlib, yacc, flex }: stdenv.mkDerivation rec { name = "vtun-3.0.3"; @@ -8,7 +8,13 @@ stdenv.mkDerivation rec { sha256 = "1jxrxp3klhc8az54d5qn84cbc0vdafg319jh84dxkrswii7vxp39"; }; - patchPhase = '' + patches = [ + (fetchpatch { url = http://sources.debian.net/data/main/v/vtun/3.0.3-2.2/debian/patches/08-gcc5-inline.patch; + sha256 = "18sys97v2hx6vac5zp3ld7sa6kz4izv3g9dnkm0lflbaxhym2vs1"; + }) + ]; + + postPatch = '' sed -i -e 's/-m 755//' -e 's/-o root -g 0//' Makefile.in sed -i '/strip/d' Makefile.in '';