Merge pull request #17001 from womfoo/fix/vtun

vtun: add debian gcc5 fix
This commit is contained in:
Joachim F 2016-07-16 21:26:50 +02:00 committed by GitHub
commit 5c837e952d

View File

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