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

bviplus: fix build with gcc5 (inline semantics)

Browse Source
This commit is contained in:
Robin Gloster 2016-02-07 16:06:56 +00:00
parent 955a9a3be7
commit 56ae3db53f
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,17 +1,23 @@
{ stdenv, lib, fetchurl, ncurses }: { stdenv, fetchurl, ncurses }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "bviplus-${version}"; name = "bviplus-${version}";
version = "0.9.4"; version = "0.9.4";
src = fetchurl { src = fetchurl {
url = "http://downloads.sourceforge.net/project/bviplus/bviplus/${version}/bviplus-${version}.tgz"; url = "mirror://sourceforge/project/bviplus/bviplus/${version}/bviplus-${version}.tgz";
sha256 = "10x6fbn8v6i0y0m40ja30pwpyqksnn8k2vqd290vxxlvlhzah4zb"; sha256 = "10x6fbn8v6i0y0m40ja30pwpyqksnn8k2vqd290vxxlvlhzah4zb";
}; };
buildInputs = [ buildInputs = [
ncurses ncurses
]; ];
patches = [ ./gcc5.diff ];
makeFlags = "PREFIX=$(out)"; makeFlags = "PREFIX=$(out)";
meta = with lib; {
meta = with stdenv.lib; {
description = "ncurses based hex editor with a vim-like interface"; description = "ncurses based hex editor with a vim-like interface";
homepage = "http://bviplus.sourceforge.net"; homepage = "http://bviplus.sourceforge.net";
license = licenses.gpl3; license = licenses.gpl3;

11
pkgs/applications/editors/bviplus/gcc5.diff Normal file
View File

@ -0,0 +1,11 @@
--- bviplus-0.9.4/vf_backend.c 2016-02-07 15:58:47.265405962 +0000
+++ bviplus-0.9.4/vf_backend.c 2016-02-07 16:04:30.020004919 +0000
@@ -253,7 +253,7 @@
/*---------------------------
---------------------------*/
-inline void compute_percent_complete(off_t offset, off_t size, int *complete)
+extern void compute_percent_complete(off_t offset, off_t size, int *complete)
{
if (size == 0)
{