Merge pull request #80546 from Luflosi/kitty-disable-strictoverflow

kitty: better fix for build error
This commit is contained in:
Michele Guerini Rocco 2020-02-19 18:52:20 +01:00 committed by GitHub
commit 7789299ff9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 13 deletions

View File

@ -4299,6 +4299,16 @@
githubId = 1784379;
name = "Kyohei Kadota";
};
Luflosi = {
name = "Luflosi";
email = "luflosi@luflosi.de";
github = "Luflosi";
githubId = 15217907;
keys = [{
longkeyid = "rsa4096/0x6F987CCF224D20B9";
fingerprint = "66D1 3048 2B5F 2069 81A6 6B83 6F98 7CCF 224D 20B9";
}];
};
luispedro = {
email = "luis@luispedro.org";
github = "luispedro";

View File

@ -74,10 +74,12 @@ buildPythonApplication rec {
})
] ++ stdenv.lib.optionals stdenv.isDarwin [
./no-lto.patch
./no-werror.patch
./png2icns.patch
];
# Causes build failure due to warning
hardeningDisable = stdenv.lib.optional stdenv.isDarwin "strictoverflow";
buildPhase = if stdenv.isDarwin then ''
${python.interpreter} setup.py kitty.app --update-check-interval=0
'' else ''
@ -123,6 +125,6 @@ buildPythonApplication rec {
description = "A modern, hackable, featureful, OpenGL based terminal emulator";
license = licenses.gpl3;
platforms = platforms.darwin ++ platforms.linux;
maintainers = with maintainers; [ tex rvolosatovs ma27 ];
maintainers = with maintainers; [ tex rvolosatovs ma27 Luflosi ];
};
}

View File

@ -1,11 +0,0 @@
--- a/setup.py
+++ b/setup.py
@@ -217,7 +217,7 @@ def init_env(
cflags = os.environ.get(
'OVERRIDE_CFLAGS', (
'-Wextra {} -Wno-missing-field-initializers -Wall -Wstrict-prototypes -std=c11'
- ' -pedantic-errors -Werror {} {} -fwrapv {} {} -pipe {} -fvisibility=hidden'
+ ' {} {} -fwrapv {} {} -pipe {} -fvisibility=hidden'
).format(
float_conversion,
optimize,