diff options
| author | Jörg Thalheim <joerg@thalheim.io> | 2018-03-10 12:53:54 +0000 |
|---|---|---|
| committer | Jörg Thalheim <joerg@thalheim.io> | 2018-03-10 15:54:32 +0000 |
| commit | 672e808dd35c3a059f29cfa4285dc1b3b296d065 (patch) | |
| tree | ea46d9c18ef855015ac9e7aff1f06b0a56927668 /pkgs/applications/editors/ht | |
| parent | b7569bfb386607d41305c9b497a2d4063e921e5e (diff) | |
ht: fix gcc7 compilation
Diffstat (limited to 'pkgs/applications/editors/ht')
| -rw-r--r-- | pkgs/applications/editors/ht/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/editors/ht/gcc7.patch | 11 |
2 files changed, 13 insertions, 0 deletions
diff --git a/pkgs/applications/editors/ht/default.nix b/pkgs/applications/editors/ht/default.nix index 112eebfaf6f6..63864bc581df 100644 --- a/pkgs/applications/editors/ht/default.nix +++ b/pkgs/applications/editors/ht/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; + patches = [ ./gcc7.patch ]; + meta = with lib; { description = "File editor/viewer/analyzer for executables"; homepage = http://hte.sourceforge.net; diff --git a/pkgs/applications/editors/ht/gcc7.patch b/pkgs/applications/editors/ht/gcc7.patch new file mode 100644 index 000000000000..a90deaac698d --- /dev/null +++ b/pkgs/applications/editors/ht/gcc7.patch @@ -0,0 +1,11 @@ +--- ht-2.1.0.org/htapp.cc 2014-09-14 16:55:26.000000000 +0100 ++++ ht-2.1.0/htapp.cc 2018-03-10 12:48:07.158533800 +0000 +@@ -3023,7 +3023,7 @@ + { + uint a = 2; + uint b = u/a; +- while (abs(a - b) > 1) { ++ while (abs((int)(a - b)) > 1) { + a = (a+b)/2; + b = u/a; + } |