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

edbrowse: Fix compilation against newer libcurl

Browse Source
This commit is contained in:
Jack Kelly 2019-01-05 11:00:26 +11:00 committed by worldofpeace
parent 535a6db25f
commit 721486626a
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/applications/editors/edbrowse/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, duktape, curl, pcre, readline, openssl, perl, html-tidy }: { stdenv, fetchFromGitHub, fetchpatch, duktape, curl, pcre, readline, openssl, perl, html-tidy }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "edbrowse-${version}"; name = "edbrowse-${version}";
@ -6,7 +6,15 @@ stdenv.mkDerivation rec {
buildInputs = [ curl pcre readline openssl duktape perl html-tidy ]; buildInputs = [ curl pcre readline openssl duktape perl html-tidy ];
patchPhase = '' patches = [
# Fix build against recent libcurl
(fetchpatch {
url = https://github.com/CMB/edbrowse/commit/5d2b9e21fdf019f461ebe62738d615428d5db963.diff;
sha256 = "167q8n0syj3iv6lxrbpv4kvb63j4byj4qxrxayy08bah3pss3gky";
})
];
postPatch = ''
for i in ./tools/*.pl for i in ./tools/*.pl
do do
substituteInPlace $i --replace "/usr/bin/perl" "${perl}/bin/perl" substituteInPlace $i --replace "/usr/bin/perl" "${perl}/bin/perl"