git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #80546 from Luflosi/kitty-disable-strictoverflow

kitty: better fix for build error

commit7789299ff9a0b596d18a79bf3e6da336dd50e4aa authorMichele Guerini Rocco <rnhmjoj@users.noreply.github.com> dateWed 19 Feb 2020, 18:52 (7 years ago) parent47ab49a2a15e3b
3 files changed+14−13
maintainers/maintainer-list.nix+10 pkgs/applications/misc/kitty/default.nix+4−2 pkgs/applications/misc/kitty/no-werror.patch−11
maintainers/maintainer-list.nix+10
@@ -4299,6 +4299,16 @@
42994299 githubId = 1784379;
43004300 name = "Kyohei Kadota";
43014301 };
4302+ Luflosi = {
4303+ name = "Luflosi";
4304+ email = "luflosi@luflosi.de";
4305+ github = "Luflosi";
4306+ githubId = 15217907;
4307+ keys = [{
4308+ longkeyid = "rsa4096/0x6F987CCF224D20B9";
4309+ fingerprint = "66D1 3048 2B5F 2069 81A6 6B83 6F98 7CCF 224D 20B9";
4310+ }];
4311+ };
43024312 luispedro = {
43034313 email = "luis@luispedro.org";
43044314 github = "luispedro";
pkgs/applications/misc/kitty/default.nix+4−2
@@ -74,10 +74,12 @@ buildPythonApplication rec {
7474 })
7575 ] ++ stdenv.lib.optionals stdenv.isDarwin [
7676 ./no-lto.patch
77− ./no-werror.patch
7877 ./png2icns.patch
7978 ];
8079
80+ # Causes build failure due to warning
81+ hardeningDisable = stdenv.lib.optional stdenv.isDarwin "strictoverflow";
82+
8183 buildPhase = if stdenv.isDarwin then ''
8284 ${python.interpreter} setup.py kitty.app --update-check-interval=0
8385 '' else ''
@@ -123,6 +125,6 @@ buildPythonApplication rec {
123125 description = "A modern, hackable, featureful, OpenGL based terminal emulator";
124126 license = licenses.gpl3;
125127 platforms = platforms.darwin ++ platforms.linux;
126− maintainers = with maintainers; [ tex rvolosatovs ma27 ];
128+ maintainers = with maintainers; [ tex rvolosatovs ma27 Luflosi ];
127129 };
128130}
pkgs/applications/misc/kitty/no-werror.patchdeleted−11
@@ -1,11 +0,0 @@
1−--- a/setup.py
2−+++ b/setup.py
3−@@ -217,7 +217,7 @@ def init_env(
4− cflags = os.environ.get(
5− 'OVERRIDE_CFLAGS', (
6− '-Wextra {} -Wno-missing-field-initializers -Wall -Wstrict-prototypes -std=c11'
7−- ' -pedantic-errors -Werror {} {} -fwrapv {} {} -pipe {} -fvisibility=hidden'
8−+ ' {} {} -fwrapv {} {} -pipe {} -fvisibility=hidden'
9− ).format(
10− float_conversion,
11− optimize,