diff options
| author | Robin Gloster <mail@glob.in> | 2016-07-15 14:41:01 +0000 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-07-15 14:41:01 +0000 |
| commit | 5185bc177309c62e53dad1ad346d1220f0e77bd4 (patch) | |
| tree | 52f5878b394abf2ef326765d46880ccbabd84903 /pkgs/applications/editors/bviplus | |
| parent | 07615735077db344539eb9131823600593f0eddf (diff) | |
| parent | f402c6321aa3c6e56f5e1f1e36c4ad459c881309 (diff) | |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/applications/editors/bviplus')
| -rw-r--r-- | pkgs/applications/editors/bviplus/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/applications/editors/bviplus/gcc5.diff | 11 |
2 files changed, 4 insertions, 15 deletions
diff --git a/pkgs/applications/editors/bviplus/default.nix b/pkgs/applications/editors/bviplus/default.nix index d61fa182379b..d08e006ec5b3 100644 --- a/pkgs/applications/editors/bviplus/default.nix +++ b/pkgs/applications/editors/bviplus/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { ncurses ]; - patches = [ ./gcc5.diff ]; - makeFlags = "PREFIX=$(out)"; + buildFlags = [ "CFLAGS=-fgnu89-inline" ]; + meta = with stdenv.lib; { - description = "ncurses based hex editor with a vim-like interface"; - homepage = "http://bviplus.sourceforge.net"; + description = "Ncurses based hex editor with a vim-like interface"; + homepage = http://bviplus.sourceforge.net; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ cstrahan ]; diff --git a/pkgs/applications/editors/bviplus/gcc5.diff b/pkgs/applications/editors/bviplus/gcc5.diff deleted file mode 100644 index 75dc57151dd5..000000000000 --- a/pkgs/applications/editors/bviplus/gcc5.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- 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) - { |